Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
e8bd0665
Commit
e8bd0665
authored
Feb 15, 2023
by
Jason Millard
Committed by
Alexandre Julliard
Feb 16, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vbscript: Fix compile issue with non hex after concat without space.
parent
71413324
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
lex.c
dlls/vbscript/lex.c
+1
-1
lang.vbs
dlls/vbscript/tests/lang.vbs
+6
-1
No files found.
dlls/vbscript/lex.c
View file @
e8bd0665
...
@@ -473,7 +473,7 @@ static int parse_next_token(void *lval, unsigned *loc, parser_ctx_t *ctx)
...
@@ -473,7 +473,7 @@ static int parse_next_token(void *lval, unsigned *loc, parser_ctx_t *ctx)
case
'#'
:
case
'#'
:
return
parse_date_literal
(
ctx
,
lval
);
return
parse_date_literal
(
ctx
,
lval
);
case
'&'
:
case
'&'
:
if
(
*++
ctx
->
ptr
==
'h'
||
*
ctx
->
ptr
==
'H'
)
if
(
(
*++
ctx
->
ptr
==
'h'
||
*
ctx
->
ptr
==
'H'
)
&&
hex_to_int
(
ctx
->
ptr
[
1
])
!=
-
1
)
return
parse_hex_literal
(
ctx
,
lval
);
return
parse_hex_literal
(
ctx
,
lval
);
return
'&'
;
return
'&'
;
case
'='
:
case
'='
:
...
...
dlls/vbscript/tests/lang.vbs
View file @
e8bd0665
...
@@ -18,7 +18,7 @@
...
@@ -18,7 +18,7 @@
OPTION
EXPLICIT
:
:
DIM
W
OPTION
EXPLICIT
:
:
DIM
W
dim
x
,
y
,
z
,
e
dim
x
,
y
,
z
,
e
,
hi
Dim
obj
Dim
obj
call
ok
(
true
,
"true is not true?"
)
call
ok
(
true
,
"true is not true?"
)
...
@@ -62,6 +62,11 @@ Call ok(&hfffe& = 65534, "&hfffe& <> -2")
...
@@ -62,6 +62,11 @@ Call ok(&hfffe& = 65534, "&hfffe& <> -2")
Call
ok
(
&
hffffffff&
=
-
1
,
"&hffffffff& <> -1"
)
Call
ok
(
&
hffffffff&
=
-
1
,
"&hffffffff& <> -1"
)
Call
ok
((
&
h01or&h02
)
=
3
,
"&h01or&h02 <> 3"
)
Call
ok
((
&
h01or&h02
)
=
3
,
"&h01or&h02 <> 3"
)
' Test concat when no space and var begins with h
hi
=
"y"
x
=
"x"
&
hi
Call
ok
(
x
=
"xy"
,
"x = "
&
x
&
" expected
""
xy
""
"
)
W
=
5
W
=
5
Call
ok
(
W
=
5
,
"W = "
&
W
&
" expected "
&
5
)
Call
ok
(
W
=
5
,
"W = "
&
W
&
" expected "
&
5
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment