Jacek Caban : vbscript: Allow 'with' as an identifier.
Alexandre Julliard
julliard at winehq.org
Fri Nov 1 15:37:48 CDT 2019
Module: wine
Branch: master
Commit: 37e27296076ee1067f5409d3fd408a11ef4e69b6
URL: https://source.winehq.org/git/wine.git/?a=commit;h=37e27296076ee1067f5409d3fd408a11ef4e69b6
Author: Jacek Caban <jacek at codeweavers.com>
Date: Fri Nov 1 17:50:45 2019 +0100
vbscript: Allow 'with' as an identifier.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/vbscript/parser.y | 1 +
dlls/vbscript/tests/lang.vbs | 1 +
dlls/vbscript/tests/run.c | 3 ++-
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/dlls/vbscript/parser.y b/dlls/vbscript/parser.y
index ffa12b2c4e..8bb99f9f9a 100644
--- a/dlls/vbscript/parser.y
+++ b/dlls/vbscript/parser.y
@@ -536,6 +536,7 @@ DotIdentifier
| tON { $$ = $1; }
| tRESUME { $$ = $1; }
| tGOTO { $$ = $1; }
+ | tWITH { $$ = $1; }
/* Most statements accept both new line and ':' as separators */
StSep
diff --git a/dlls/vbscript/tests/lang.vbs b/dlls/vbscript/tests/lang.vbs
index 0520038a02..8a6fa7834b 100644
--- a/dlls/vbscript/tests/lang.vbs
+++ b/dlls/vbscript/tests/lang.vbs
@@ -1522,6 +1522,7 @@ sub test_dotIdentifiers
Call ok(testObj.on = 10, "testObj.on = " & testObj.on & " expected 10")
Call ok(testObj.resume = 10, "testObj.resume = " & testObj.resume & " expected 10")
Call ok(testObj.goto = 10, "testObj.goto = " & testObj.goto & " expected 10")
+ Call ok(testObj.with = 10, "testObj.with = " & testObj.with & " expected 10")
end sub
call test_dotIdentifiers
diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c
index 765a0353d1..527055f83b 100644
--- a/dlls/vbscript/tests/run.c
+++ b/dlls/vbscript/tests/run.c
@@ -855,7 +855,8 @@ static HRESULT WINAPI testObj_GetDispID(IDispatchEx *iface, BSTR bstrName, DWORD
{ L"next", DISPID_TESTOBJ_KEYWORD },
{ L"on", DISPID_TESTOBJ_KEYWORD },
{ L"resume", DISPID_TESTOBJ_KEYWORD },
- { L"goto", DISPID_TESTOBJ_KEYWORD }
+ { L"goto", DISPID_TESTOBJ_KEYWORD },
+ { L"with", DISPID_TESTOBJ_KEYWORD }
};
test_grfdex(grfdex, fdexNameCaseInsensitive);
More information about the wine-cvs
mailing list