Module: wine Branch: master Commit: 5cf0d974167acf8495202050b51915716db0db6a URL: https://gitlab.winehq.org/wine/wine/-/commit/5cf0d974167acf8495202050b519157...
Author: Robert Wilhelm robert.wilhelm@gmx.net Date: Sun Nov 27 22:47:46 2022 +0100
vbscript: Accept private and public const global declarations.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53783
---
dlls/vbscript/parser.y | 4 +++- dlls/vbscript/tests/lang.vbs | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y index 4b9d53d3bca..88f098f3714 100644 --- a/dlls/vbscript/parser.y +++ b/dlls/vbscript/parser.y @@ -175,7 +175,9 @@ SourceElements | SourceElements ClassDeclaration { source_add_class(ctx, $2); }
GlobalDimDeclaration - : tPRIVATE DimDeclList { $$ = new_dim_statement(ctx, @$, $2); CHECK_ERROR; } + : tPRIVATE tCONST ConstDeclList { $$ = new_const_statement(ctx, @$, $3); CHECK_ERROR; } + | tPUBLIC tCONST ConstDeclList { $$ = new_const_statement(ctx, @$, $3); CHECK_ERROR; } + | tPRIVATE DimDeclList { $$ = new_dim_statement(ctx, @$, $2); CHECK_ERROR; } | tPUBLIC DimDeclList { $$ = new_dim_statement(ctx, @$, $2); CHECK_ERROR; }
ExpressionNl_opt diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs index 0e8dae4049f..ddfaf20a19d 100644 --- a/dlls/vbscript/tests/lang.vbs +++ b/dlls/vbscript/tests/lang.vbs @@ -1210,10 +1210,16 @@ Call ok(getVT(test) = "VT_DISPATCH", "getVT(test) = " & getVT(test)) Call ok(Me is Test, "Me is not Test")
Const c1 = 1, c2 = 2, c3 = -3 +Private Const c4 = 4 +Public Const c5 = 5 Call ok(c1 = 1, "c1 = " & c1) Call ok(getVT(c1) = "VT_I2", "getVT(c1) = " & getVT(c1)) Call ok(c3 = -3, "c3 = " & c3) Call ok(getVT(c3) = "VT_I2", "getVT(c3) = " & getVT(c3)) +Call ok(c4 = 4, "c4 = " & c4) +Call ok(getVT(c4) = "VT_I2", "getVT(c4) = " & getVT(c4)) +Call ok(c5 = 5, "c5 = " & c5) +Call ok(getVT(c5) = "VT_I2", "getVT(c5) = " & getVT(c5))
Const cb = True, cs = "test", cnull = null Call ok(cb, "cb = " & cb)