wine-commits September 2011

wine-commits@winehq.org

2 participants
996 discussions

Jacek Caban : vbscript: Added additive expressions parser/ compiler implementation.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 0ec93395334bdb069c2b206ad5e6d9c6053cbd56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ec93395334bdb069c2b206ad… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 12 12:31:58 2011 +0200 vbscript: Added additive expressions parser/compiler implementation. --- dlls/vbscript/compile.c | 4 ++++ dlls/vbscript/interp.c | 12 ++++++++++++ dlls/vbscript/parse.h | 2 ++ dlls/vbscript/parser.y | 7 ++++++- dlls/vbscript/vbscript.h | 4 +++- 5 files changed, 27 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index baaa078..9e34c35 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -234,6 +234,8 @@ static HRESULT compile_binary_expression(compile_ctx_t *ctx, binary_expression_t static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) { switch(expr->type) { + case EXPR_ADD: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_add); case EXPR_BOOL: return push_instr_int(ctx, OP_bool, ((bool_expression_t*)expr)->value); case EXPR_CONCAT: @@ -254,6 +256,8 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) return push_instr(ctx, OP_null) != -1 ? S_OK : E_OUTOFMEMORY; case EXPR_STRING: return push_instr_str(ctx, OP_string, ((string_expression_t*)expr)->value); + case EXPR_SUB: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_sub); case EXPR_USHORT: return push_instr_int(ctx, OP_short, ((int_expression_t*)expr)->value); case EXPR_ULONG: diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 67230da..fb3adfe 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -391,6 +391,18 @@ static HRESULT interp_concat(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT interp_add(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT interp_sub(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static HRESULT interp_neg(exec_ctx_t *ctx) { variant_val_t val; diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 0c87209..3d6d604 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -17,6 +17,7 @@ */ typedef enum { + EXPR_ADD, EXPR_BOOL, EXPR_CONCAT, EXPR_DOUBLE, @@ -27,6 +28,7 @@ typedef enum { EXPR_NOT, EXPR_NULL, EXPR_STRING, + EXPR_SUB, EXPR_ULONG, EXPR_USHORT } expression_type_t; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 316957c..2f42ab6 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -83,7 +83,7 @@ static statement_t *new_call_statement(parser_ctx_t*,member_expression_t*); %type <statement> Statement StatementNl %type <expression> Expression LiteralExpression PrimaryExpression EqualityExpression CallExpression -%type <expression> ConcatExpression AdditiveExpression +%type <expression> ConcatExpression AdditiveExpression ModExpression %type <expression> NotExpression UnaryExpression %type <member> MemberExpression %type <expression> Arguments_opt ArgumentList_opt ArgumentList @@ -145,6 +145,11 @@ ConcatExpression | ConcatExpression '&' AdditiveExpression { $$ = new_binary_expression(ctx, EXPR_CONCAT, $1, $3); CHECK_ERROR; } AdditiveExpression + : ModExpression { $$ = $1; } + | AdditiveExpression '+' ModExpression { $$ = new_binary_expression(ctx, EXPR_ADD, $1, $3); CHECK_ERROR; } + | AdditiveExpression '-' ModExpression { $$ = new_binary_expression(ctx, EXPR_SUB, $1, $3); CHECK_ERROR; } + +ModExpression : UnaryExpression /* FIXME */ { $$ = $1; } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 9db2692..cf90b38 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -88,6 +88,7 @@ typedef enum { } instr_arg_type_t; #define OP_LIST \ + X(add, 1, 0, 0) \ X(bool, 1, ARG_INT, 0) \ X(concat, 1, 0, 0) \ X(double, 1, ARG_DOUBLE, 0) \ @@ -101,7 +102,8 @@ typedef enum { X(null, 1, 0, 0) \ X(ret, 0, 0, 0) \ X(short, 1, ARG_INT, 0) \ - X(string, 1, ARG_STR, 0) + X(string, 1, ARG_STR, 0) \ + X(sub, 1, 0, 0) typedef enum { #define X(x,n,a,b) OP_##x,

1 0

Jacek Caban : vbscript: Added interp_neg implementation.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 8e1ccb8be6efd4b31fac18ae9c31454311848da0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e1ccb8be6efd4b31fac18ae9… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 12 12:31:47 2011 +0200 vbscript: Added interp_neg implementation. --- dlls/vbscript/interp.c | 16 ++++++++++++++-- dlls/vbscript/tests/lang.vbs | 6 ++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index a70ca5f..67230da 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -393,8 +393,20 @@ static HRESULT interp_concat(exec_ctx_t *ctx) static HRESULT interp_neg(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + variant_val_t val; + VARIANT v; + HRESULT hres; + + hres = stack_pop_val(ctx, &val); + if(FAILED(hres)) + return hres; + + hres = VarNeg(val.v, &v); + release_val(&val); + if(FAILED(hres)) + return hres; + + return stack_push(ctx, &v); } static const instr_func_t op_funcs[] = { diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index dc64c91..9b1d771 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -35,6 +35,10 @@ Call ok(0 = 0.0, "0 <> 0.0") Call ok(16 = &h10&, "16 <> &h10&") Call ok(010 = 10, "010 <> 10") Call ok(10. = 10, "10. <> 10") +Call ok(&hffFFffFF& = -1, "&hffFFffFF& <> -1") +Call ok(&hffFFffFF& = -1, "&hffFFffFF& <> -1") +Call ok(--1 = 1, "--1 = " & --1) +Call ok(-empty = 0, "-empty = " & (-empty)) Call ok(getVT(false) = "VT_BOOL", "getVT(false) is not VT_BOOL") Call ok(getVT(true) = "VT_BOOL", "getVT(true) is not VT_BOOL") @@ -53,6 +57,8 @@ Call ok(getVT(&h10000&) = "VT_I4", "getVT(&h10000&) is not VT_I4") Call ok(getVT(&H10000&) = "VT_I4", "getVT(&H10000&) is not VT_I4") Call ok(getVT(&hffFFffFF&) = "VT_I2", "getVT(&hffFFffFF&) is not VT_I2") Call ok(getVT(1 & 100000) = "VT_BSTR", "getVT(1 & 100000) is not VT_BSTR") +Call ok(getVT(-empty) = "VT_I2", "getVT(-empty) = " & getVT(-empty)) +Call ok(getVT(-null) = "VT_NULL", "getVT(-null) = " & getVT(-null)) Call ok("ab" & "cd" = "abcd", """ab"" & ""cd"" <> ""abcd""") Call ok("ab " & null = "ab ", """ab"" & null = " & ("ab " & null))

1 0

Jacek Caban : vbscript: Added negation expression parser/ compiler implementation.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: fb5509ec06939b26647e8054dd439aba9c0913c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb5509ec06939b26647e8054d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 12 12:31:37 2011 +0200 vbscript: Added negation expression parser/compiler implementation. --- dlls/vbscript/compile.c | 2 ++ dlls/vbscript/interp.c | 6 ++++++ dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 11 ++++++++--- dlls/vbscript/vbscript.h | 1 + 5 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 9e59fe1..baaa078 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -246,6 +246,8 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_equal); case EXPR_MEMBER: return compile_member_expression(ctx, (member_expression_t*)expr, TRUE); + case EXPR_NEG: + return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_neg); case EXPR_NOT: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_not); case EXPR_NULL: diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 90531fb..a70ca5f 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -391,6 +391,12 @@ static HRESULT interp_concat(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT interp_neg(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/parse.h b/dlls/vbscript/parse.h index b47360c..0c87209 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -23,6 +23,7 @@ typedef enum { EXPR_EMPTY, EXPR_EQUAL, EXPR_MEMBER, + EXPR_NEG, EXPR_NOT, EXPR_NULL, EXPR_STRING, diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 756cf6a..316957c 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -84,7 +84,7 @@ static statement_t *new_call_statement(parser_ctx_t*,member_expression_t*); %type <statement> Statement StatementNl %type <expression> Expression LiteralExpression PrimaryExpression EqualityExpression CallExpression %type <expression> ConcatExpression AdditiveExpression -%type <expression> NotExpression +%type <expression> NotExpression UnaryExpression %type <member> MemberExpression %type <expression> Arguments_opt ArgumentList_opt ArgumentList %type <bool> OptionExplicit_opt @@ -145,8 +145,13 @@ ConcatExpression | ConcatExpression '&' AdditiveExpression { $$ = new_binary_expression(ctx, EXPR_CONCAT, $1, $3); CHECK_ERROR; } AdditiveExpression - : LiteralExpression /* FIXME */ { $$ = $1; } - | CallExpression /* FIXME */ { $$ = $1; } + : UnaryExpression /* FIXME */ { $$ = $1; } + + +UnaryExpression + : LiteralExpression { $$ = $1; } + | CallExpression { $$ = $1; } + | '-' UnaryExpression { $$ = new_unary_expression(ctx, EXPR_NEG, $2); CHECK_ERROR; } CallExpression : PrimaryExpression { $$ = $1; } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 2abbc9d..9db2692 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -96,6 +96,7 @@ typedef enum { X(icall, 1, ARG_BSTR, ARG_UINT) \ X(icallv, 1, ARG_BSTR, ARG_UINT) \ X(long, 1, ARG_INT, 0) \ + X(neg, 1, 0, 0) \ X(not, 1, 0, 0) \ X(null, 1, 0, 0) \ X(ret, 0, 0, 0) \

1 0

Jacek Caban : vbscript: Added concatenation tests.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: a5fe24c61d03189c431d98f229ee2674e6cfb703 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5fe24c61d03189c431d98f22… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 12 12:31:07 2011 +0200 vbscript: Added concatenation tests. --- dlls/vbscript/tests/lang.vbs | 11 +++++++++++ dlls/vbscript/tests/run.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index dba5c9a..dc64c91 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -52,5 +52,16 @@ Call ok(getVT(&h10&) = "VT_I2", "getVT(&h10&) is not VT_I2") Call ok(getVT(&h10000&) = "VT_I4", "getVT(&h10000&) is not VT_I4") Call ok(getVT(&H10000&) = "VT_I4", "getVT(&H10000&) is not VT_I4") Call ok(getVT(&hffFFffFF&) = "VT_I2", "getVT(&hffFFffFF&) is not VT_I2") +Call ok(getVT(1 & 100000) = "VT_BSTR", "getVT(1 & 100000) is not VT_BSTR") + +Call ok("ab" & "cd" = "abcd", """ab"" & ""cd"" <> ""abcd""") +Call ok("ab " & null = "ab ", """ab"" & null = " & ("ab " & null)) +Call ok("ab " & empty = "ab ", """ab"" & empty = " & ("ab " & empty)) +Call ok(1 & 100000 = "1100000", "1 & 100000 = " & (1 & 100000)) + +'if(isEnglishLocale) then +' Call ok("" & true = "True", """"" & true = " & true) +' Call ok(true & false = "TrueFalse", "true & false = " & (true & false)) +'end if reportSuccess() diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c index 329d75a..dac8bec 100644 --- a/dlls/vbscript/tests/run.c +++ b/dlls/vbscript/tests/run.c @@ -63,6 +63,7 @@ DEFINE_EXPECT(global_success_i); #define DISPID_GLOBAL_TRACE 1001 #define DISPID_GLOBAL_OK 1002 #define DISPID_GLOBAL_GETVT 1003 +#define DISPID_GLOBAL_ISENGLOC 1004 static const WCHAR testW[] = {'t','e','s','t',0}; @@ -121,6 +122,12 @@ static const char *vt2a(VARIANT *v) } } +static BOOL is_english(void) +{ + return PRIMARYLANGID(GetSystemDefaultLangID()) == LANG_ENGLISH + && PRIMARYLANGID(GetUserDefaultLangID()) == LANG_ENGLISH; +} + #define test_grfdex(a,b) _test_grfdex(__LINE__,a,b) static void _test_grfdex(unsigned line, DWORD grfdex, DWORD expect) { @@ -240,6 +247,11 @@ static HRESULT WINAPI Global_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD *pid = DISPID_GLOBAL_GETVT; return S_OK; } + if(!strcmp_wa(bstrName, "isEnglishLocale")) { + test_grfdex(grfdex, fdexNameCaseInsensitive); + *pid = DISPID_GLOBAL_ISENGLOC; + return S_OK; + } if(strict_dispid_check && strcmp_wa(bstrName, "x")) ok(0, "unexpected call %s %x\n", wine_dbgstr_w(bstrName), grfdex); @@ -319,6 +331,25 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, V_VT(pvarRes) = VT_BSTR; V_BSTR(pvarRes) = a2bstr(vt2a(pdp->rgvarg)); return S_OK; + + case DISPID_GLOBAL_ISENGLOC: + ok(wFlags == (INVOKE_FUNC|INVOKE_PROPERTYGET), "wFlags = %x\n", wFlags); + ok(pdp != NULL, "pdp == NULL\n"); + ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); + ok(pdp->cArgs == 0, "cArgs = %d\n", pdp->cArgs); + ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); + ok(pvarRes != NULL, "pvarRes == NULL\n"); + ok(pei != NULL, "pei == NULL\n"); + + V_VT(pvarRes) = VT_BOOL; + if(is_english()) { + V_BOOL(pvarRes) = VARIANT_TRUE; + }else { + skip("Skipping some test in non-English locale\n"); + V_BOOL(pvarRes) = VARIANT_FALSE; + } + return S_OK; + } ok(0, "unexpected call %d\n", id);

1 0

Jacek Caban : vbscript: Added interp_concat implementation.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: fad15f782a9b70c0c5a924e6735bf7ef30502333 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fad15f782a9b70c0c5a924e67… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 12 12:30:57 2011 +0200 vbscript: Added interp_concat implementation. --- dlls/vbscript/interp.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 7ee58a2..90531fb 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -369,8 +369,26 @@ static HRESULT interp_equal(exec_ctx_t *ctx) static HRESULT interp_concat(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + variant_val_t r, l; + VARIANT v; + HRESULT hres; + + TRACE("\n"); + + hres = stack_pop_val(ctx, &r); + if(FAILED(hres)) + return hres; + + hres = stack_pop_val(ctx, &l); + if(SUCCEEDED(hres)) { + hres = VarCat(l.v, r.v, &v); + release_val(&l); + } + release_val(&r); + if(FAILED(hres)) + return hres; + + return stack_push(ctx, &v); } static const instr_func_t op_funcs[] = {

1 0

Jacek Caban : vbscript: Added concatenation expression parser/ compiler support.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: e06017b2a37ebfcc635641816229fd6a00641b02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e06017b2a37ebfcc635641816… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 12 12:30:47 2011 +0200 vbscript: Added concatenation expression parser/compiler support. --- dlls/vbscript/compile.c | 2 ++ dlls/vbscript/interp.c | 6 ++++++ dlls/vbscript/parse.h | 1 + dlls/vbscript/parser.y | 6 +++++- dlls/vbscript/vbscript.h | 1 + 5 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index b398d85..9e59fe1 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -236,6 +236,8 @@ 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_CONCAT: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_concat); case EXPR_DOUBLE: return push_instr_double(ctx, OP_double, ((double_expression_t*)expr)->value); case EXPR_EMPTY: diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index 1661700..7ee58a2 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -367,6 +367,12 @@ static HRESULT interp_equal(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT interp_concat(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/parse.h b/dlls/vbscript/parse.h index 82a60a9..b47360c 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -18,6 +18,7 @@ typedef enum { EXPR_BOOL, + EXPR_CONCAT, EXPR_DOUBLE, EXPR_EMPTY, EXPR_EQUAL, diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index ef12328..756cf6a 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -83,7 +83,7 @@ static statement_t *new_call_statement(parser_ctx_t*,member_expression_t*); %type <statement> Statement StatementNl %type <expression> Expression LiteralExpression PrimaryExpression EqualityExpression CallExpression -%type <expression> ConcatExpression +%type <expression> ConcatExpression AdditiveExpression %type <expression> NotExpression %type <member> MemberExpression %type <expression> Arguments_opt ArgumentList_opt ArgumentList @@ -141,6 +141,10 @@ EqualityExpression | EqualityExpression '=' ConcatExpression { $$ = new_binary_expression(ctx, EXPR_EQUAL, $1, $3); CHECK_ERROR; } ConcatExpression + : AdditiveExpression { $$ = $1; } + | ConcatExpression '&' AdditiveExpression { $$ = new_binary_expression(ctx, EXPR_CONCAT, $1, $3); CHECK_ERROR; } + +AdditiveExpression : LiteralExpression /* FIXME */ { $$ = $1; } | CallExpression /* FIXME */ { $$ = $1; } diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 7835eb2..2abbc9d 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -89,6 +89,7 @@ typedef enum { #define OP_LIST \ X(bool, 1, ARG_INT, 0) \ + X(concat, 1, 0, 0) \ X(double, 1, ARG_DOUBLE, 0) \ X(empty, 1, 0, 0) \ X(equal, 1, 0, 0) \

1 0

Jacek Caban : vbscript: Added hex literal implementation.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: e5d25a170a27b781bdd62240cfb57d1e328a081e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5d25a170a27b781bdd62240c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 12 12:30:34 2011 +0200 vbscript: Added hex literal implementation. --- dlls/vbscript/lex.c | 33 +++++++++++++++++++++++++++++++++ dlls/vbscript/tests/lang.vbs | 8 ++++++++ 2 files changed, 41 insertions(+), 0 deletions(-) diff --git a/dlls/vbscript/lex.c b/dlls/vbscript/lex.c index ddafee9..394a24d 100644 --- a/dlls/vbscript/lex.c +++ b/dlls/vbscript/lex.c @@ -267,6 +267,35 @@ static int parse_numeric_literal(parser_ctx_t *ctx, void **ret) return tDouble; } +static int hex_to_int(WCHAR c) +{ + if('0' <= c && c <= '9') + return c-'0'; + if('a' <= c && c <= 'f') + return c+10-'a'; + if('A' <= c && c <= 'F') + return c+10-'A'; + return -1; +} + +static int parse_hex_literal(parser_ctx_t *ctx, LONG *ret) +{ + const WCHAR *begin = ctx->ptr; + LONG l = 0, d; + + while((d = hex_to_int(*++ctx->ptr)) != -1) + l = l*16 + d; + + if(begin + 9 /* max digits+1 */ < ctx->ptr || *ctx->ptr != '&') { + FIXME("invalid literal\n"); + return 0; + } + + ctx->ptr++; + *ret = l; + return (short)l == l ? tShort : tLong; +} + static void skip_spaces(parser_ctx_t *ctx) { while(*ctx->ptr == ' ' || *ctx->ptr == '\t' || *ctx->ptr == '\r') @@ -329,6 +358,10 @@ static int parse_next_token(void *lval, parser_ctx_t *ctx) return '('; case '"': return parse_string_literal(ctx, lval); + case '&': + if(*++ctx->ptr == 'h' || *ctx->ptr == 'H') + return parse_hex_literal(ctx, lval); + return '&'; case '<': switch(*++ctx->ptr) { case '>': diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 91da4fe..dba5c9a 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -31,6 +31,10 @@ Call ok(not (true = false), "true = false is true") Call ok("x" = "x", """x"" = ""x"" is false") Call ok(empty = empty, "empty = empty is false") Call ok(empty = "", "empty = """" is false") +Call ok(0 = 0.0, "0 <> 0.0") +Call ok(16 = &h10&, "16 <> &h10&") +Call ok(010 = 10, "010 <> 10") +Call ok(10. = 10, "10. <> 10") Call ok(getVT(false) = "VT_BOOL", "getVT(false) is not VT_BOOL") Call ok(getVT(true) = "VT_BOOL", "getVT(true) is not VT_BOOL") @@ -44,5 +48,9 @@ Call ok(getVT(0.5) = "VT_R8", "getVT(0.5) is not VT_R8") Call ok(getVT(0.0) = "VT_R8", "getVT(0.0) is not VT_R8") Call ok(getVT(2147483647) = "VT_I4", "getVT(2147483647) is not VT_I4") Call ok(getVT(2147483648) = "VT_R8", "getVT(2147483648) is not VT_R8") +Call ok(getVT(&h10&) = "VT_I2", "getVT(&h10&) is not VT_I2") +Call ok(getVT(&h10000&) = "VT_I4", "getVT(&h10000&) is not VT_I4") +Call ok(getVT(&H10000&) = "VT_I4", "getVT(&H10000&) is not VT_I4") +Call ok(getVT(&hffFFffFF&) = "VT_I2", "getVT(&hffFFffFF&) is not VT_I2") reportSuccess()

1 0

Jacek Caban : vbscript: Added interpreter support for numeric literals.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 66d3dd4b7e30a0a4baffb9ff3926934f3c061c49 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66d3dd4b7e30a0a4baffb9ff3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 12 12:30:21 2011 +0200 vbscript: Added interpreter support for numeric literals. --- dlls/vbscript/interp.c | 30 ++++++++++++++++++++++++------ dlls/vbscript/tests/lang.vbs | 6 ++++++ 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index e7e3ab3..1661700 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -253,20 +253,38 @@ static HRESULT interp_string(exec_ctx_t *ctx) static HRESULT interp_long(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + const LONG arg = ctx->instr->arg1.lng; + VARIANT v; + + TRACE("%d\n", arg); + + V_VT(&v) = VT_I4; + V_I4(&v) = arg; + return stack_push(ctx, &v); } static HRESULT interp_short(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + const LONG arg = ctx->instr->arg1.lng; + VARIANT v; + + TRACE("%d\n", arg); + + V_VT(&v) = VT_I2; + V_I2(&v) = arg; + return stack_push(ctx, &v); } static HRESULT interp_double(exec_ctx_t *ctx) { - FIXME("\n"); - return E_NOTIMPL; + const DOUBLE *arg = ctx->instr->arg1.dbl; + VARIANT v; + + TRACE("%lf\n", *arg); + + V_VT(&v) = VT_R8; + V_R8(&v) = *arg; + return stack_push(ctx, &v); } static HRESULT interp_empty(exec_ctx_t *ctx) diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 8a5a9c5..91da4fe 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -38,5 +38,11 @@ Call ok(getVT("") = "VT_BSTR", "getVT("""") is not VT_BSTR") Call ok(getVT("test") = "VT_BSTR", "getVT(""test"") is not VT_BSTR") Call ok(getVT(Empty) = "VT_EMPTY", "getVT(Empty) is not VT_EMPTY") Call ok(getVT(null) = "VT_NULL", "getVT(null) is not VT_NULL") +Call ok(getVT(0) = "VT_I2", "getVT(0) is not VT_I2") +Call ok(getVT(1) = "VT_I2", "getVT(1) is not VT_I2") +Call ok(getVT(0.5) = "VT_R8", "getVT(0.5) is not VT_R8") +Call ok(getVT(0.0) = "VT_R8", "getVT(0.0) is not VT_R8") +Call ok(getVT(2147483647) = "VT_I4", "getVT(2147483647) is not VT_I4") +Call ok(getVT(2147483648) = "VT_R8", "getVT(2147483648) is not VT_R8") reportSuccess()

1 0

Jacek Caban : vbscript: Added compiler support for numeric literals.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 880d706636b2f202470744c1d5bdc3be42a0fe39 URL: http://source.winehq.org/git/wine.git/?a=commit;h=880d706636b2f202470744c1d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 12 12:30:11 2011 +0200 vbscript: Added compiler support for numeric literals. --- dlls/vbscript/compile.c | 24 ++++++++++++++++++++++++ dlls/vbscript/interp.c | 18 ++++++++++++++++++ dlls/vbscript/vbscript.h | 7 ++++++- 3 files changed, 48 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/compile.c b/dlls/vbscript/compile.c index 450fa18..b398d85 100644 --- a/dlls/vbscript/compile.c +++ b/dlls/vbscript/compile.c @@ -107,6 +107,24 @@ static HRESULT push_instr_str(compile_ctx_t *ctx, vbsop_t op, const WCHAR *arg) return S_OK; } +static HRESULT push_instr_double(compile_ctx_t *ctx, vbsop_t op, double arg) +{ + unsigned instr; + double *d; + + d = compiler_alloc(ctx->code, sizeof(double)); + if(!d) + return E_OUTOFMEMORY; + + instr = push_instr(ctx, op); + if(instr == -1) + return E_OUTOFMEMORY; + + *d = arg; + instr_ptr(ctx, instr)->arg1.dbl = d; + return S_OK; +} + static BSTR alloc_bstr_arg(compile_ctx_t *ctx, const WCHAR *str) { if(!ctx->code->bstr_pool_size) { @@ -218,6 +236,8 @@ 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_DOUBLE: + return push_instr_double(ctx, OP_double, ((double_expression_t*)expr)->value); case EXPR_EMPTY: return push_instr(ctx, OP_empty) != -1 ? S_OK : E_OUTOFMEMORY; case EXPR_EQUAL: @@ -230,6 +250,10 @@ static HRESULT compile_expression(compile_ctx_t *ctx, expression_t *expr) return push_instr(ctx, OP_null) != -1 ? S_OK : E_OUTOFMEMORY; case EXPR_STRING: return push_instr_str(ctx, OP_string, ((string_expression_t*)expr)->value); + case EXPR_USHORT: + return push_instr_int(ctx, OP_short, ((int_expression_t*)expr)->value); + case EXPR_ULONG: + return push_instr_int(ctx, OP_long, ((int_expression_t*)expr)->value); default: FIXME("Unimplemented expression type %d\n", expr->type); return E_NOTIMPL; diff --git a/dlls/vbscript/interp.c b/dlls/vbscript/interp.c index d02516e..e7e3ab3 100644 --- a/dlls/vbscript/interp.c +++ b/dlls/vbscript/interp.c @@ -251,6 +251,24 @@ static HRESULT interp_string(exec_ctx_t *ctx) return stack_push(ctx, &v); } +static HRESULT interp_long(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT interp_short(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + +static HRESULT interp_double(exec_ctx_t *ctx) +{ + FIXME("\n"); + return E_NOTIMPL; +} + static HRESULT interp_empty(exec_ctx_t *ctx) { VARIANT v; diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 9c047d1..7835eb2 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -83,18 +83,22 @@ typedef enum { ARG_STR, ARG_BSTR, ARG_INT, - ARG_UINT + ARG_UINT, + ARG_DOUBLE } instr_arg_type_t; #define OP_LIST \ X(bool, 1, ARG_INT, 0) \ + X(double, 1, ARG_DOUBLE, 0) \ X(empty, 1, 0, 0) \ X(equal, 1, 0, 0) \ X(icall, 1, ARG_BSTR, ARG_UINT) \ X(icallv, 1, ARG_BSTR, ARG_UINT) \ + X(long, 1, ARG_INT, 0) \ X(not, 1, 0, 0) \ X(null, 1, 0, 0) \ X(ret, 0, 0, 0) \ + X(short, 1, ARG_INT, 0) \ X(string, 1, ARG_STR, 0) typedef enum { @@ -109,6 +113,7 @@ typedef union { BSTR bstr; unsigned uint; LONG lng; + double *dbl; } instr_arg_t; typedef struct {

1 0

Jacek Caban : vbscript: Added parser support for numeric literals.
by Alexandre Julliard 12 Sep '11

12 Sep '11

Module: wine Branch: master Commit: 7f835c969e28313d3431a04494a8d0bef21d657d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f835c969e28313d3431a0449… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Sep 12 12:29:59 2011 +0200 vbscript: Added parser support for numeric literals. --- dlls/vbscript/parse.h | 15 ++++++++++++++- dlls/vbscript/parser.y | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletions(-) diff --git a/dlls/vbscript/parse.h b/dlls/vbscript/parse.h index 0e69921..82a60a9 100644 --- a/dlls/vbscript/parse.h +++ b/dlls/vbscript/parse.h @@ -18,12 +18,15 @@ typedef enum { EXPR_BOOL, + EXPR_DOUBLE, EXPR_EMPTY, EXPR_EQUAL, EXPR_MEMBER, EXPR_NOT, EXPR_NULL, - EXPR_STRING + EXPR_STRING, + EXPR_ULONG, + EXPR_USHORT } expression_type_t; typedef struct _expression_t { @@ -38,6 +41,16 @@ typedef struct { typedef struct { expression_t expr; + LONG value; +} int_expression_t; + +typedef struct { + expression_t expr; + double value; +} double_expression_t; + +typedef struct { + expression_t expr; const WCHAR *value; } string_expression_t; diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index a5fff60..ef12328 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -38,6 +38,8 @@ static void source_add_statement(parser_ctx_t*,statement_t*); static void *new_expression(parser_ctx_t*,expression_type_t,size_t); static expression_t *new_bool_expression(parser_ctx_t*,VARIANT_BOOL); static expression_t *new_string_expression(parser_ctx_t*,const WCHAR*); +static expression_t *new_long_expression(parser_ctx_t*,expression_type_t,LONG); +static expression_t *new_double_expression(parser_ctx_t*,double); static expression_t *new_unary_expression(parser_ctx_t*,expression_type_t,expression_t*); static expression_t *new_binary_expression(parser_ctx_t*,expression_type_t,expression_t*,expression_t*); @@ -57,7 +59,9 @@ static statement_t *new_call_statement(parser_ctx_t*,member_expression_t*); statement_t *statement; expression_t *expression; member_expression_t *member; + LONG lng; BOOL bool; + double dbl; } %token tEOF tNL tREM tEMPTYBRACKETS @@ -148,6 +152,10 @@ LiteralExpression : tTRUE { $$ = new_bool_expression(ctx, VARIANT_TRUE); CHECK_ERROR; } | tFALSE { $$ = new_bool_expression(ctx, VARIANT_FALSE); CHECK_ERROR; } | tString { $$ = new_string_expression(ctx, $1); CHECK_ERROR; } + | tShort { $$ = new_long_expression(ctx, EXPR_USHORT, $1); CHECK_ERROR; } + | '0' { $$ = new_long_expression(ctx, EXPR_USHORT, 0); CHECK_ERROR; } + | tLong { $$ = new_long_expression(ctx, EXPR_ULONG, $1); CHECK_ERROR; } + | tDouble { $$ = new_double_expression(ctx, $1); CHECK_ERROR; } | tEMPTY { $$ = new_expression(ctx, EXPR_EMPTY, 0); CHECK_ERROR; } | tNULL { $$ = new_expression(ctx, EXPR_NULL, 0); CHECK_ERROR; } @@ -214,6 +222,30 @@ static expression_t *new_string_expression(parser_ctx_t *ctx, const WCHAR *value return &expr->expr; } +static expression_t *new_long_expression(parser_ctx_t *ctx, expression_type_t type, LONG value) +{ + int_expression_t *expr; + + expr = new_expression(ctx, type, sizeof(*expr)); + if(!expr) + return NULL; + + expr->value = value; + return &expr->expr; +} + +static expression_t *new_double_expression(parser_ctx_t *ctx, double value) +{ + double_expression_t *expr; + + expr = new_expression(ctx, EXPR_DOUBLE, sizeof(*expr)); + if(!expr) + return NULL; + + expr->value = value; + return &expr->expr; +} + static expression_t *new_unary_expression(parser_ctx_t *ctx, expression_type_t type, expression_t *subexpr) { unary_expression_t *expr;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2011