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
7a76856e
Commit
7a76856e
authored
Jan 22, 2020
by
Jacek Caban
Committed by
Alexandre Julliard
Jan 23, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vbscript: Store source location in instr_t.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
21346c76
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
0 deletions
+9
-0
compile.c
dlls/vbscript/compile.c
+8
-0
vbscript.h
dlls/vbscript/vbscript.h
+1
-0
No files found.
dlls/vbscript/compile.c
View file @
7a76856e
...
...
@@ -44,6 +44,7 @@ typedef struct {
unsigned
instr_size
;
vbscode_t
*
code
;
unsigned
loc
;
statement_ctx_t
*
stat_ctx
;
unsigned
*
labels
;
...
...
@@ -162,6 +163,7 @@ static unsigned push_instr(compile_ctx_t *ctx, vbsop_t op)
}
ctx
->
code
->
instrs
[
ctx
->
instr_cnt
].
op
=
op
;
ctx
->
code
->
instrs
[
ctx
->
instr_cnt
].
loc
=
ctx
->
loc
;
return
ctx
->
instr_cnt
++
;
}
...
...
@@ -630,6 +632,8 @@ static HRESULT compile_if_statement(compile_ctx_t *ctx, if_statement_t *stat)
for
(
elseif_decl
=
stat
->
elseifs
;
elseif_decl
;
elseif_decl
=
elseif_decl
->
next
)
{
instr_ptr
(
ctx
,
cnd_jmp
)
->
arg1
.
uint
=
ctx
->
instr_cnt
;
ctx
->
loc
=
elseif_decl
->
loc
;
hres
=
compile_expression
(
ctx
,
elseif_decl
->
expr
);
if
(
FAILED
(
hres
))
return
hres
;
...
...
@@ -723,6 +727,7 @@ static HRESULT compile_dowhile_statement(compile_ctx_t *ctx, while_statement_t *
if
(
FAILED
(
hres
))
return
hres
;
ctx
->
loc
=
stat
->
stat
.
loc
;
if
(
stat
->
expr
)
{
hres
=
compile_expression
(
ctx
,
stat
->
expr
);
if
(
FAILED
(
hres
))
...
...
@@ -778,6 +783,7 @@ static HRESULT compile_foreach_statement(compile_ctx_t *ctx, foreach_statement_t
return
hres
;
/* We need a separated enumnext here, because we need to jump out of the loop on exception. */
ctx
->
loc
=
stat
->
stat
.
loc
;
hres
=
push_instr_uint_bstr
(
ctx
,
OP_enumnext
,
loop_ctx
.
for_end_label
,
stat
->
identifier
);
if
(
FAILED
(
hres
))
return
hres
;
...
...
@@ -1295,6 +1301,8 @@ static HRESULT compile_statement(compile_ctx_t *ctx, statement_ctx_t *stat_ctx,
}
while
(
stat
)
{
ctx
->
loc
=
stat
->
loc
;
switch
(
stat
->
type
)
{
case
STAT_ASSIGN
:
hres
=
compile_assign_statement
(
ctx
,
(
assign_statement_t
*
)
stat
,
FALSE
);
...
...
dlls/vbscript/vbscript.h
View file @
7a76856e
...
...
@@ -294,6 +294,7 @@ typedef union {
typedef
struct
{
vbsop_t
op
;
unsigned
loc
;
instr_arg_t
arg1
;
instr_arg_t
arg2
;
}
instr_t
;
...
...
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