[PATCH v4 0/1] MR10489: vbscript: Return specific error codes for missing keywords in parser.

[Francis De Brabandere (＠francisdb)]

Add error productions in the bison grammar for five cases where a
specific keyword is expected after a recognized prefix:

- Expected '=' after identifier in Const declaration (error 1011)
- Expected 'To' after expression in For loop (error 1013)
- Expected 'Then' after expression in If statement (error 1017)
- Expected 'Case' after Select (error 1021)
- Expected 'In' after identifier in For Each loop (error 1046)

Previously these all 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.

--
  v4: vbscript: Return specific error codes for missing keywords in parser.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10489

[PATCH v4 1/1] vbscript: Return specific error codes for missing keywords in parser.

[Francis De Brabandere]

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

Add error productions in the bison grammar for five cases where a
specific keyword is expected after a recognized prefix:

- Expected '=' after identifier in Const declaration (error 1011)
- Expected 'To' after expression in For loop (error 1013)
- Expected 'Then' after expression in If statement (error 1017)
- Expected 'Case' after Select (error 1021)
- Expected 'In' after identifier in For Each loop (error 1046)

Previously these all 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    |  6 ++++++
 dlls/vbscript/tests/run.c | 10 +++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y
index e716bf98d3a..0bb45192698 100644
--- a/dlls/vbscript/parser.y
+++ b/dlls/vbscript/parser.y
@@ -254,12 +254,16 @@ SimpleStatement
     | tCONST ConstDeclList                  { $$ = new_const_statement(ctx, @$, $2); CHECK_ERROR; }
     | tFOR Identifier '=' Expression tTO Expression Step_opt StSep StatementsNl_opt tNEXT
                                             { $$ = new_forto_statement(ctx, @$, $2, $4, $6, $7, $9); CHECK_ERROR; }
+    | tFOR Identifier '=' Expression error
+                                            { ctx->hres = MAKE_VBSERROR(VBSE_EXPECTED_TO); YYABORT; }
     | tFOR tEACH Identifier tIN Expression StSep StatementsNl_opt tNEXT
                                             { $$ = new_foreach_statement(ctx, @$, $3, $5, $7); }
+    | tFOR tEACH Identifier error           { ctx->hres = MAKE_VBSERROR(VBSE_EXPECTED_IN); YYABORT; }
     | tSELECT tCASE Expression StSep CaseClausules tEND tSELECT
                                             { $$ = new_select_statement(ctx, @$, $3, $5); }
     | tSELECT tCASE Expression StSep CaseClausules tEND error
                                             { ctx->hres = MAKE_VBSERROR(VBSE_EXPECTED_SELECT); YYABORT; }
+    | tSELECT error                         { ctx->hres = MAKE_VBSERROR(VBSE_EXPECTED_CASE); YYABORT; }
     | tWITH Expression StSep StatementsNl_opt tEND tWITH
                                             { $$ = new_with_statement(ctx, @$, $2, $4); }
     | tWITH Expression StSep StatementsNl_opt tEND error
@@ -315,6 +319,7 @@ ConstDeclList
 
 ConstDecl
     : Identifier '=' ConstExpression        { $$ = new_const_decl(ctx, $1, $3); CHECK_ERROR; }
+    | Identifier error                      { ctx->hres = MAKE_VBSERROR(VBSE_EXPECTED_ASSIGN); YYABORT; }
 
 ConstExpression
     : LiteralExpression                     { $$ = $1; }
@@ -338,6 +343,7 @@ IfStatement
                                                 { $$ = new_if_statement(ctx, @$, $2, $4, NULL, NULL); CHECK_ERROR; }
     | tIF Expression tTHEN tNL StSep_opt StatementsNl_opt ElseIfs_opt Else_opt tEND error
                                                 { ctx->hres = MAKE_VBSERROR(VBSE_EXPECTED_IF); YYABORT; }
+    | tIF Expression error                       { ctx->hres = MAKE_VBSERROR(VBSE_EXPECTED_THEN); YYABORT; }
 
 EndIf_opt
     : /* empty */
diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c
index bc09f7a96c0..9b3c61bcdf7 100644
--- a/dlls/vbscript/tests/run.c
+++ b/dlls/vbscript/tests/run.c
@@ -2953,19 +2953,19 @@ static void test_parse_errors(void)
             /* Expected '=' - error 1011 */
             L"Const x\n",
             0, 7,
-            NULL, S_OK, -1011
+            NULL, S_OK, 1011
         },
         {
             /* Expected 'To' - error 1013 */
             L"For i = 1 x 10\nNext\n",
             0, 10,
-            NULL, S_OK, -1013
+            NULL, S_OK, 1013
         },
         {
             /* Expected 'Then' - error 1017 */
             L"If True\nEnd If\n",
             0, 7,
-            NULL, S_OK, -1017
+            NULL, S_OK, 1017
         },
         {
             /* Expected 'Wend' - error 1018 */
@@ -2989,7 +2989,7 @@ static void test_parse_errors(void)
             /* Expected 'Case' - error 1021 */
             L"Select x\nEnd Select\n",
             0, 7,
-            NULL, S_OK, -1021
+            NULL, S_OK, 1021
         },
         {
             /* Expected integer constant - error 1026 */
@@ -3019,7 +3019,7 @@ static void test_parse_errors(void)
             /* Expected 'In' - error 1046 */
             L"For Each x = arr\nNext\n",
             0, 11,
-            NULL, S_OK, -1046
+            NULL, S_OK, 1046
         },
         {
             /* Must be defined inside a Class - error 1048 */
-- 
GitLab

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

[PATCH v4 0/1] MR10489: vbscript: Return specific error codes for missing keywords in parser. - approved

[Jacek Caban (＠jacek)]

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