From 5193b6fa69ee7efd8f68a3ac42f706cc1bc7c545 Mon Sep 17 00:00:00 2001 From: Dmitry Kislyuk Date: Tue, 10 Oct 2017 04:31:42 -0500 Subject: [PATCH] vbscript: Improve parsing of separators after Option Explicit. Signed-off-by: Dmitry Kislyuk Signed-off-by: Jacek Caban Signed-off-by: Alexandre Julliard --- 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 beb4e4c7d04..dcd7b73699d 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 7c83b74f12a..8ee92a6eb85 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""")