[Bug 53678] New: vbscript can not compile CaseClausules that do not use a colon

[WineHQ Bugzilla]

https://bugs.winehq.org/show_bug.cgi?id=53678

Bug ID: 53678
           Summary: vbscript can not compile CaseClausules that do not use
                    a colon
           Product: Wine
           Version: 7.16
          Hardware: x86-64
                OS: Linux
            Status: UNCONFIRMED
          Severity: normal
          Priority: P2
         Component: vbscript
          Assignee: [e-mail]
          Reporter: [e-mail]
      Distribution: ---

While working on leveraging the vbscript engine of Wine for a macos port of
Visual Pinball, I've been testing several user made scripts.

I've found a few scripts, where users did not use a colon after a case. This
seems to work in vbscript:

Set g_objWSH = Wscript.CreateObject("Wscript.Shell")

dim x

x = 2

Select Case x
   Case 0: 'If Enabled Then
   Case 2 Wscript.Echo "This works 2"
   Case 3: Wscript.Echo "This works 3"
   Case 4
      Wscript.Echo "This works 4"
End Select

[Bug 53678] vbscript can not compile CaseClausules that do not use a colon

[WineHQ Bugzilla]

https://bugs.winehq.org/show_bug.cgi?id=53678

Jason Millard  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |[e-mail]

[Bug 53678] vbscript can not compile CaseClausules that do not use a colon

[WineHQ Bugzilla]

https://bugs.winehq.org/show_bug.cgi?id=53678

Robert Wilhelm  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |[e-mail]

--- Comment #1 from Robert Wilhelm  ---
Created attachment 73090
  --> https://bugs.winehq.org/attachment.cgi?id=73090
patch

[Bug 53678] vbscript can not compile CaseClausules that do not use a colon

[WineHQ Bugzilla]

https://bugs.winehq.org/show_bug.cgi?id=53678

Robert Wilhelm  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
           Keywords|                            |patch

[Bug 53678] vbscript can not compile CaseClausules that do not use a colon

[WineHQ Bugzilla]

https://bugs.winehq.org/show_bug.cgi?id=53678

Robert Wilhelm  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
     Ever confirmed|0                           |1
             Status|UNCONFIRMED                 |NEW

--- Comment #2 from Robert Wilhelm  ---
confirming.

[Bug 53678] vbscript can not compile CaseClausules that do not use a colon

[WineHQ Bugzilla]

https://bugs.winehq.org/show_bug.cgi?id=53678

--- Comment #3 from Jason Millard  ---
Just test this patch. Works great! Thanks again!

[Bug 53678] vbscript can not compile CaseClausules that do not use a colon

[WineHQ Bugzilla]

https://bugs.winehq.org/show_bug.cgi?id=53678

--- Comment #4 from Jason Millard  ---
I just ran into another script that uses "Case ELSE" without a colon:

"Case Else vpmKeyUp = False"

Updated CaseClausules as:

CaseClausules
    : /* empty */                          { $$ = NULL; }
    | tCASE tELSE StSep StatementsNl_opt   { $$ = new_case_clausule(ctx, NULL,
$4, NULL); }
    | tCASE tELSE StatementsNl_opt         { $$ = new_case_clausule(ctx, NULL,
$3, NULL); }
    | tCASE ExpressionList StSep StatementsNl_opt CaseClausules
                                           { $$ = new_case_clausule(ctx, $2,
$4, $5); }
    | tCASE ExpressionList StatementsNl_opt CaseClausules
                                           { $$ = new_case_clausule(ctx, $2,
$3, $4); }

[Bug 53678] vbscript can not compile CaseClausules that do not use a colon

[WineHQ Bugzilla]

https://bugs.winehq.org/show_bug.cgi?id=53678

--- Comment #5 from Nikolay Sivov  ---
In this case we'll probably use StStep_opt then? Jason, Robert, are you going
to fix that up and submit a patch?

[Bug 53678] vbscript can not compile CaseClausules that do not use a colon

[WineHQ Bugzilla]

https://bugs.winehq.org/show_bug.cgi?id=53678

--- Comment #6 from Robert Wilhelm  ---
I am quite busy these days but I plan to start again submitting patches in
about one week.

[Bug 53678] vbscript can not compile CaseClausules that do not use a colon

[WineHQ Bugzilla]

https://bugs.winehq.org/show_bug.cgi?id=53678

--- Comment #7 from Jason Millard  ---
(In reply to Nikolay Sivov from comment #5)
> In this case we'll probably use StStep_opt then? Jason, Robert, are you
> going to fix that up and submit a patch?

Sorry I didn't see this comment, but I see the MR today. Thanks again for
getting this fixed!

[Bug 53678] vbscript can not compile CaseClausules that do not use a colon

[WineHQ Bugzilla]

https://bugs.winehq.org/show_bug.cgi?id=53678

Nikolay Sivov  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|NEW                         |RESOLVED
      Fixed by SHA1|                            |39058487ecddf8e528cab226f66
                   |                            |c99d2c4790a22
         Resolution|---                         |FIXED

--- Comment #8 from Nikolay Sivov  ---
Marking fixed, 39058487ecddf8e528cab226f66c99d2c4790a22.

[Bug 53678] vbscript can not compile CaseClausules that do not use a colon

[WineHQ Bugzilla]

https://bugs.winehq.org/show_bug.cgi?id=53678

Alexandre Julliard  changed:

What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|RESOLVED                    |CLOSED

--- Comment #9 from Alexandre Julliard  ---
Closing bugs fixed in 8.0-rc1.