Robert Wilhelm : vbscript: Handle "case" statements without separators.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 39058487ecddf8e528cab226f66c99d2c4790a22
URL:    https://gitlab.winehq.org/wine/wine/-/commit/39058487ecddf8e528cab226f66c99d...

Author: Robert Wilhelm <robert.wilhelm(a)gmx.net>
Date:   Wed Nov 30 14:49:10 2022 +0300

vbscript: Handle "case" statements without separators.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53678
Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>

---

 dlls/vbscript/parser.y       | 11 +++++++----
 dlls/vbscript/tests/lang.vbs | 20 ++++++++++++++++++++
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y
index 88f098f3714..816252eb2ec 100644
--- a/dlls/vbscript/parser.y
+++ b/dlls/vbscript/parser.y
@@ -323,10 +323,9 @@ Else_opt
     | tELSE StatementsNl_opt                { $$ = $2; }
 
 CaseClausules
-    : /* empty */                          { $$ = NULL; }
-    | tCASE tELSE StSep StatementsNl_opt   { $$ = new_case_clausule(ctx, NULL, $4, NULL); }
-    | tCASE ExpressionList StSep StatementsNl_opt CaseClausules
-                                           { $$ = new_case_clausule(ctx, $2, $4, $5); }
+    : /* empty */                                                      { $$ = NULL; }
+    | tCASE tELSE StSep_opt StatementsNl_opt                           { $$ = new_case_clausule(ctx, NULL, $4, NULL); }
+    | tCASE ExpressionList StSep_opt StatementsNl_opt CaseClausules    { $$ = new_case_clausule(ctx, $2, $4, $5); }
 
 Arguments
     : tEMPTYBRACKETS                { $$ = NULL; }
@@ -513,6 +512,10 @@ Identifier
     | tPROPERTY      { ctx->last_token = tIdentifier; $$ = $1; }
     | tSTEP          { ctx->last_token = tIdentifier; $$ = $1; }
 
+StSep_opt
+    : /* empty */
+    | StSep
+
 /* Most statements accept both new line and ':' as separators */
 StSep
     : tNL
diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs
index d27277508c0..3a67cd09dff 100644
--- a/dlls/vbscript/tests/lang.vbs
+++ b/dlls/vbscript/tests/lang.vbs
@@ -766,6 +766,26 @@ end select
 
 select case 0 : case 1 : case else : end select
 
+' Case without separator
+function SelectCaseTest(x)
+    select case x
+        case 0: SelectCaseTest = 100
+        case 1  SelectCaseTest = 200
+        case 2
+                SelectCaseTest = 300
+        case 3
+        case 4  SelectCaseTest = 400
+        case else SelectCaseTest = 500
+    end select
+end function
+
+call ok(SelectCaseTest(0) = 100, "Unexpected case " & SelectCaseTest(0))
+call ok(SelectCaseTest(1) = 200, "Unexpected case " & SelectCaseTest(1))
+call ok(SelectCaseTest(2) = 300, "Unexpected case " & SelectCaseTest(2))
+call ok(SelectCaseTest(3) = vbEmpty, "Unexpected case " & SelectCaseTest(3))
+call ok(SelectCaseTest(4) = 400, "Unexpected case " & SelectCaseTest(4))
+call ok(SelectCaseTest(5) = 500, "Unexpected case " & SelectCaseTest(5))
+
 if false then
 Sub testsub
     x = true