vbscript: Added ME expression parser implementation.

diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c
index 11023781a42d527b53e435bf3b33c6a5a9abe2db..b2c0cc1249707d0b85f6658dbb794be44b62812e 100644 (file)
--- a/dlls/vbscript/compile.c
+++ b/dlls/vbscript/compile.c
@@ -405,6 +405,8 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr)
         return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_lt);
     case EXPR_LTEQ:
         return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_lteq);
+    case EXPR_ME:
+        return push_instr(ctx, OP_me) != -1 ? S_OK : E_OUTOFMEMORY;
     case EXPR_MEMBER:
         return compile_member_expression(ctx, (member_expression_t*)expr, TRUE);
     case EXPR_MOD:

diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c
index 0593a8633389f973be9174d1de7bd9295b82e4b8..831a39d92ed62975d24008eeb436141deacf3c52 100644 (file)
--- a/dlls/vbscript/interp.c
+++ b/dlls/vbscript/interp.c
@@ -708,6 +708,12 @@ static HRESULT interp_stop(exec_ctx_t *ctx)
     return S_OK;
 }
 
+static HRESULT interp_me(exec_ctx_t *ctx)
+{
+    FIXME("\n");
+    return E_NOTIMPL;
+}
+
 static HRESULT interp_bool(exec_ctx_t *ctx)
 {
     const VARIANT_BOOL arg = ctx->instr->arg1.lng;

diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h
index b61582b9a714e229c913c2eb5e320c0bb94cc713..bff48bbe7fa7d2a1764383615084e2fd7358221d 100644 (file)
--- a/dlls/vbscript/parse.h
+++ b/dlls/vbscript/parse.h
@@ -34,6 +34,7 @@ typedef enum {
     EXPR_IS,
     EXPR_LT,
     EXPR_LTEQ,
+    EXPR_ME,
     EXPR_MEMBER,
     EXPR_MOD,
     EXPR_MUL,

diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y
index f25d82591c59e4a88f7822d32343871232b433de..a3fb134b63c9c59034bec8e6f1f520069a646379 100644 (file)
--- a/dlls/vbscript/parser.y
+++ b/dlls/vbscript/parser.y
@@ -307,6 +307,7 @@ LiteralExpression
 
 PrimaryExpression
     : '(' Expression ')'            { $$ = $2; }
+    | tME                           { $$ = new_expression(ctx, EXPR_ME, 0); CHECK_ERROR; }
 
 ClassDeclaration
     : tCLASS tIdentifier tNL ClassBody tEND tCLASS tNL      { $4->name = $2; $$ = $4; }

diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h
index dc842cf19d379891f96609394cacd019e9b922ae..a1e07b90f811473638989ff0aac5a6140273e4d3 100644 (file)
--- a/dlls/vbscript/vbscript.h
+++ b/dlls/vbscript/vbscript.h
@@ -203,6 +203,7 @@ typedef enum {
     X(lteq,           1, 0,           0)          \
     X(mcall,          1, ARG_BSTR,    ARG_UINT)   \
     X(mcallv,         1, ARG_BSTR,    ARG_UINT)   \
+    X(me,             1, 0,           0)          \
     X(mod,            1, 0,           0)          \
     X(mul,            1, 0,           0)          \
     X(neg,            1, 0,           0)          \