Commit ded37832 authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard

vbscript: Added compiler support for string literals.

parent 23c1fea0
...@@ -73,6 +73,18 @@ static HRESULT push_instr_int(compile_ctx_t *ctx, vbsop_t op, LONG arg) ...@@ -73,6 +73,18 @@ static HRESULT push_instr_int(compile_ctx_t *ctx, vbsop_t op, LONG arg)
return S_OK; return S_OK;
} }
static HRESULT push_instr_str(compile_ctx_t *ctx, vbsop_t op, const WCHAR *arg)
{
unsigned ret;
ret = push_instr(ctx, op);
if(ret == -1)
return E_OUTOFMEMORY;
instr_ptr(ctx, ret)->arg1.str = arg;
return S_OK;
}
static BSTR alloc_bstr_arg(compile_ctx_t *ctx, const WCHAR *str) static BSTR alloc_bstr_arg(compile_ctx_t *ctx, const WCHAR *str)
{ {
if(!ctx->code->bstr_pool_size) { if(!ctx->code->bstr_pool_size) {
...@@ -158,6 +170,8 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) ...@@ -158,6 +170,8 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr)
switch(expr->type) { switch(expr->type) {
case EXPR_BOOL: case EXPR_BOOL:
return push_instr_int(ctx, OP_bool, ((bool_expression_t*)expr)->value); return push_instr_int(ctx, OP_bool, ((bool_expression_t*)expr)->value);
case EXPR_STRING:
return push_instr_str(ctx, OP_string, ((string_expression_t*)expr)->value);
default: default:
FIXME("Unimplemented expression type %d\n", expr->type); FIXME("Unimplemented expression type %d\n", expr->type);
return E_NOTIMPL; return E_NOTIMPL;
......
...@@ -119,6 +119,12 @@ static HRESULT interp_bool(exec_ctx_t *ctx) ...@@ -119,6 +119,12 @@ static HRESULT interp_bool(exec_ctx_t *ctx)
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT interp_string(exec_ctx_t *ctx)
{
FIXME("\n");
return E_NOTIMPL;
}
static const instr_func_t op_funcs[] = { static const instr_func_t op_funcs[] = {
#define X(x,n,a,b) interp_ ## x, #define X(x,n,a,b) interp_ ## x,
OP_LIST OP_LIST
......
...@@ -77,7 +77,8 @@ typedef enum { ...@@ -77,7 +77,8 @@ typedef enum {
#define OP_LIST \ #define OP_LIST \
X(bool, 1, ARG_INT, 0) \ X(bool, 1, ARG_INT, 0) \
X(icallv, 1, ARG_BSTR, ARG_UINT) \ X(icallv, 1, ARG_BSTR, ARG_UINT) \
X(ret, 0, 0, 0) X(ret, 0, 0, 0) \
X(string, 1, ARG_STR, 0)
typedef enum { typedef enum {
#define X(x,n,a,b) OP_##x, #define X(x,n,a,b) OP_##x,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment