Dmitry Kislyuk : vbscript: Improve parsing of separators after Option Explicit.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5193b6fa69ee7efd8f68a3ac42f706cc1bc7c545
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5193b6fa69ee7efd8f68a3ac42...

Author: Dmitry Kislyuk <dimaki(a)rocketmail.com>
Date:   Tue Oct 10 04:31:42 2017 -0500

vbscript: Improve parsing of separators after Option Explicit.

Signed-off-by: Dmitry Kislyuk <dimaki(a)rocketmail.com>
Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

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

diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y
index beb4e4c..dcd7b73 100644
--- a/dlls/vbscript/parser.y
+++ b/dlls/vbscript/parser.y
@@ -148,7 +148,7 @@ Program
 
 OptionExplicit_opt
     : /* empty */                { $$ = FALSE; }
-    | tOPTION tEXPLICIT tNL      { $$ = TRUE; }
+    | tOPTION tEXPLICIT StSep    { $$ = TRUE; }
 
 SourceElements
     : /* empty */
diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs
index 7c83b74..8ee92a6 100644
--- a/dlls/vbscript/tests/lang.vbs
+++ b/dlls/vbscript/tests/lang.vbs
@@ -16,7 +16,7 @@
 ' Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
 '
 
-Option Explicit
+OPTION EXPLICIT  : : DIM W
 
 dim x, y, z
 Dim obj
@@ -53,6 +53,9 @@ Call ok(false = 0, "false <> 0")
 Call ok(&hff = 255, "&hff <> 255")
 Call ok(&Hff = 255, "&Hff <> 255")
 
+W = 5
+Call ok(W = 5, "W = " & W & " expected " & 5)
+
 x = "xx"
 Call ok(x = "xx", "x = " & x & " expected ""xx""")