[PATCH v3 0/1] MR10490: vbscript: Return specific error codes for integer constant and Property declarations.

[Francis De Brabandere (＠francisdb)]

Add error productions in the bison grammar for two cases:

- Expected integer constant in Dim array bounds (error 1026)
  e.g. Dim x("a") where a numeric value is required.
- Expected Let, Set, or Get after Property keyword (error 1049)
  e.g. Property x without specifying the accessor type.

Previously these fell through to the generic E_FAIL path in
parser_error(). Now each sets the correct VBSE_EXPECTED_* error code
via MAKE_VBSERROR before aborting the parse.

--
  v3: vbscript: Return specific error codes for integer constant and Property declarations.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10490

[PATCH v3 1/1] vbscript: Return specific error codes for integer constant and Property declarations.

[Francis De Brabandere]

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

Add error productions in the bison grammar for two cases:

- Expected integer constant in Dim array bounds (error 1026)
  e.g. Dim x("a") where a numeric value is required.
- Expected Let, Set, or Get after Property keyword (error 1049)
  e.g. Property x without specifying the accessor type.

Previously these fell through to the generic E_FAIL path in
parser_error(). Now each sets the correct VBSE_EXPECTED_* error code
via MAKE_VBSERROR before aborting the parse.
---
 dlls/vbscript/parser.y    | 2 ++
 dlls/vbscript/tests/run.c | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y
index 1a8ae2013c9..8c768d7a634 100644
--- a/dlls/vbscript/parser.y
+++ b/dlls/vbscript/parser.y
@@ -296,6 +296,7 @@ DimDecl
 DimList
     : IntegerValue                          { $$ = new_dim(ctx, $1, NULL); }
     | IntegerValue ',' DimList              { $$ = new_dim(ctx, $1, $3); }
+    | error                                 { ctx->hres = MAKE_VBSERROR(VBSE_EXPECTED_INTEGER_CONSTANT); YYABORT; }
 
 ConstDeclList
     : ConstDecl                             { $$ = $1; }
@@ -520,6 +521,7 @@ PropertyDecl
                                     { ctx->hres = MAKE_VBSERROR(VBSE_PROPERTY_LET_SET_NEEDS_ARG); YYABORT; }
     | Storage_opt tPROPERTY tSET Identifier error
                                     { ctx->hres = MAKE_VBSERROR(VBSE_PROPERTY_LET_SET_NEEDS_ARG); YYABORT; }
+    | Storage_opt tPROPERTY error   { ctx->hres = MAKE_VBSERROR(VBSE_EXPECTED_LET_SET_GET); YYABORT; }
 
 FunctionDecl
     : Storage_opt tSUB Identifier StSep BodyStatements tEND tSUB
diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c
index 37c8883fcd9..e62edb366e3 100644
--- a/dlls/vbscript/tests/run.c
+++ b/dlls/vbscript/tests/run.c
@@ -2995,7 +2995,7 @@ static void test_parse_errors(void)
             /* Expected integer constant - error 1026 */
             L"Dim x(\"a\")\n",
             0, 6,
-            NULL, S_OK, -1026
+            NULL, S_OK, 1026
         },
         {
             /* Invalid number - error 1031 */
@@ -3031,7 +3031,7 @@ static void test_parse_errors(void)
             /* Expected Let or Set or Get - error 1049 */
             L"Class C\nProperty x\nEnd Property\nEnd Class\n",
             1, 9,
-            NULL, S_OK, -1049
+            NULL, S_OK, 1049
         },
         {
             /* Class_Initialize with arguments - error 1053 */
-- 
GitLab

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

[PATCH v3 0/1] MR10490: vbscript: Return specific error codes for integer constant and Property declarations. - approved

[Jacek Caban (＠jacek)]

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