Jacek Caban : vbscript: Added compiler support for |not| expression.

Alexandre Julliard julliard at winehq.org
Fri Sep 9 10:56:47 CDT 2011


Module: wine
Branch: master
Commit: 7f9464ce2759eb96ccc0bb7b782ce029689f692d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=7f9464ce2759eb96ccc0bb7b782ce029689f692d

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Fri Sep  9 14:47:45 2011 +0200

vbscript: Added compiler support for |not| expression.

---

 dlls/vbscript/compile.c  |   13 +++++++++++++
 dlls/vbscript/interp.c   |    6 ++++++
 dlls/vbscript/vbscript.h |    1 +
 3 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c
index ea55177..c64c30c 100644
--- a/dlls/vbscript/compile.c
+++ b/dlls/vbscript/compile.c
@@ -165,11 +165,24 @@ static HRESULT compile_member_expression(compile_ctx_t *ctx, member_expression_t
     return hres;
 }
 
+static HRESULT compile_unary_expression(compile_ctx_t *ctx, unary_expression_t *expr, vbsop_t op)
+{
+    HRESULT hres;
+
+    hres = compile_expression(ctx, expr->subexpr);
+    if(FAILED(hres))
+        return hres;
+
+    return push_instr(ctx, op) == -1 ? E_OUTOFMEMORY : S_OK;
+}
+
 static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr)
 {
     switch(expr->type) {
     case EXPR_BOOL:
         return push_instr_int(ctx, OP_bool, ((bool_expression_t*)expr)->value);
+    case EXPR_NOT:
+        return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_not);
     case EXPR_STRING:
         return push_instr_str(ctx, OP_string, ((string_expression_t*)expr)->value);
     default:
diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c
index a33ff90..f582e80 100644
--- a/dlls/vbscript/interp.c
+++ b/dlls/vbscript/interp.c
@@ -198,6 +198,12 @@ static HRESULT interp_string(exec_ctx_t *ctx)
     return stack_push(ctx, &v);
 }
 
+static HRESULT interp_not(exec_ctx_t *ctx)
+{
+    FIXME("\n");
+    return E_NOTIMPL;
+}
+
 static const instr_func_t op_funcs[] = {
 #define X(x,n,a,b) interp_ ## x,
 OP_LIST
diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h
index 54d7da5..3f55b40 100644
--- a/dlls/vbscript/vbscript.h
+++ b/dlls/vbscript/vbscript.h
@@ -77,6 +77,7 @@ typedef enum {
 #define OP_LIST                                   \
     X(bool,           1, ARG_INT,     0)          \
     X(icallv,         1, ARG_BSTR,    ARG_UINT)   \
+    X(not,            1, 0,           0)          \
     X(ret,            0, 0,           0)          \
     X(string,         1, ARG_STR,     0)
 




More information about the wine-cvs mailing list