[PATCH v6 0/1] MR10493: vbscript: Return error 1048 for Property declaration outside a Class.

[Francis De Brabandere (＠francisdb)]

When Property Get appears at global scope (outside a Class block),
Windows returns error 1048 ("must be defined inside a Class").

Detect the tGET token in parser_error() — it is only valid after
tPROPERTY inside a PropertyDecl, so encountering it at statement
level means a Property was used outside a class context.

--
  v6: vbscript: Return error 1048 for Property declaration outside a Class.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10493

[PATCH v6 1/1] vbscript: Return error 1048 for Property declaration outside a Class.

[Francis De Brabandere]

From: Francis De Brabandere <[e-mail]>

When Property Get, Property Let, or Property Set appears at global
scope (outside a Class block), Windows returns error 1048 ("must be
defined inside a Class").

Add explicit tPROPERTY tGET/tLET/tSET productions in SimpleStatement
that set the correct error code and abort. Bison resolves the
shift-reduce conflict with Identifier (which also accepts tPROPERTY)
by preferring shift, which is the desired behavior.
---
 dlls/vbscript/parser.y    |  3 +++
 dlls/vbscript/tests/run.c | 14 +++++++++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y
index c166ba68790..ca64651c82d 100644
--- a/dlls/vbscript/parser.y
+++ b/dlls/vbscript/parser.y
@@ -255,6 +255,9 @@ SimpleStatement
                                             { $$ = new_with_statement(ctx, @$, $2, $4); }
     | tWITH Expression StSep StatementsNl_opt tEND error
                                             { ctx->hres = MAKE_VBSERROR(VBSE_EXPECTED_WITH); YYABORT; }
+    | tPROPERTY tGET                        { ctx->error_loc = @2; ctx->hres = MAKE_VBSERROR(VBSE_MUST_BE_INSIDE_CLASS); YYABORT; }
+    | tPROPERTY tLET                        { ctx->error_loc = @2; ctx->hres = MAKE_VBSERROR(VBSE_MUST_BE_INSIDE_CLASS); YYABORT; }
+    | tPROPERTY tSET                        { ctx->error_loc = @2; ctx->hres = MAKE_VBSERROR(VBSE_MUST_BE_INSIDE_CLASS); YYABORT; }
 
 MemberExpression
     : Identifier                            { $$ = new_member_expression(ctx, NULL, $1); CHECK_ERROR; }
diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c
index df8602523e3..36c190af57e 100644
--- a/dlls/vbscript/tests/run.c
+++ b/dlls/vbscript/tests/run.c
@@ -3025,7 +3025,19 @@ static void test_parse_errors(void)
             /* Must be defined inside a Class - error 1048 */
             L"Property Get x\nEnd Property\n",
             0, 9,
-            NULL, S_OK, -1048
+            NULL, S_OK, 1048
+        },
+        {
+            /* Must be defined inside a Class - error 1048 (Let) */
+            L"Property Let x\nEnd Property\n",
+            0, 9,
+            NULL, S_OK, 1048
+        },
+        {
+            /* Must be defined inside a Class - error 1048 (Set) */
+            L"Property Set x\nEnd Property\n",
+            0, 9,
+            NULL, S_OK, 1048
         },
         {
             /* Expected Let or Set or Get - error 1049 */
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/10493

[PATCH v6 0/1] MR10493: vbscript: Return error 1048 for Property declaration outside a Class. - approved

[Jacek Caban (＠jacek)]

This merge request was approved by Jacek Caban.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10493