Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mruby
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
mruby
Commits
d098d823
Commit
d098d823
authored
Mar 30, 2016
by
Yukihiro "Matz" Matsumoto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix duplicated eval in op_asgn
`a` in `a.m += c` or `a[b] += c` should be evaluated only once.
parent
4979b52d
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
47 additions
and
2 deletions
+47
-2
mrbgems/mruby-compiler/core/codegen.c
mrbgems/mruby-compiler/core/codegen.c
+47
-2
No files found.
mrbgems/mruby-compiler/core/codegen.c
View file @
d098d823
...
@@ -1716,7 +1716,7 @@ codegen(codegen_scope *s, node *tree, int val)
...
@@ -1716,7 +1716,7 @@ codegen(codegen_scope *s, node *tree, int val)
mrb_sym
sym
=
sym
(
tree
->
cdr
->
car
);
mrb_sym
sym
=
sym
(
tree
->
cdr
->
car
);
mrb_int
len
;
mrb_int
len
;
const
char
*
name
=
mrb_sym2name_len
(
s
->
mrb
,
sym
,
&
len
);
const
char
*
name
=
mrb_sym2name_len
(
s
->
mrb
,
sym
,
&
len
);
int
idx
;
int
idx
,
callargs
=
-
1
,
vsp
=
-
1
;
if
((
len
==
2
&&
name
[
0
]
==
'|'
&&
name
[
1
]
==
'|'
)
&&
if
((
len
==
2
&&
name
[
0
]
==
'|'
&&
name
[
1
]
==
'|'
)
&&
((
intptr_t
)
tree
->
car
->
car
==
NODE_CONST
||
((
intptr_t
)
tree
->
car
->
car
==
NODE_CONST
||
...
@@ -1737,6 +1737,34 @@ codegen(codegen_scope *s, node *tree, int val)
...
@@ -1737,6 +1737,34 @@ codegen(codegen_scope *s, node *tree, int val)
genop
(
s
,
MKOP_A
(
OP_LOADF
,
exc
));
genop
(
s
,
MKOP_A
(
OP_LOADF
,
exc
));
dispatch
(
s
,
noexc
);
dispatch
(
s
,
noexc
);
}
}
else
if
((
intptr_t
)
tree
->
car
->
car
==
NODE_CALL
)
{
node
*
n
=
tree
->
car
->
cdr
;
if
(
val
)
{
vsp
=
cursp
();
push
();
}
codegen
(
s
,
n
->
car
,
VAL
);
/* receiver */
idx
=
new_msym
(
s
,
sym
(
n
->
cdr
->
car
));
if
(
n
->
cdr
->
cdr
->
car
)
{
int
i
=
gen_values
(
s
,
n
->
cdr
->
cdr
->
car
->
car
,
VAL
);
if
(
i
>=
0
)
{
pop_n
(
i
);
genop
(
s
,
MKOP_ABC
(
OP_ARRAY
,
cursp
(),
cursp
(),
i
));
}
genop
(
s
,
MKOP_AB
(
OP_MOVE
,
cursp
()
+
1
,
cursp
()
-
1
));
genop
(
s
,
MKOP_AB
(
OP_MOVE
,
cursp
()
+
2
,
cursp
()));
push
();
genop
(
s
,
MKOP_ABC
(
OP_SEND
,
cursp
(),
idx
,
CALL_MAXARGS
));
callargs
=
CALL_MAXARGS
;
}
else
{
genop
(
s
,
MKOP_AB
(
OP_MOVE
,
cursp
(),
cursp
()
-
1
));
genop
(
s
,
MKOP_ABC
(
OP_SEND
,
cursp
(),
idx
,
0
));
callargs
=
1
;
}
push
();
}
else
{
else
{
codegen
(
s
,
tree
->
car
,
VAL
);
codegen
(
s
,
tree
->
car
,
VAL
);
}
}
...
@@ -1785,8 +1813,25 @@ codegen(codegen_scope *s, node *tree, int val)
...
@@ -1785,8 +1813,25 @@ codegen(codegen_scope *s, node *tree, int val)
else
{
else
{
genop
(
s
,
MKOP_ABC
(
OP_SEND
,
cursp
(),
idx
,
1
));
genop
(
s
,
MKOP_ABC
(
OP_SEND
,
cursp
(),
idx
,
1
));
}
}
}
if
(
callargs
<
0
)
{
gen_assignment
(
s
,
tree
->
car
,
cursp
(),
val
);
gen_assignment
(
s
,
tree
->
car
,
cursp
(),
val
);
}
else
{
if
(
callargs
==
CALL_MAXARGS
)
{
genop
(
s
,
MKOP_AB
(
OP_ARYPUSH
,
cursp
()
-
1
,
cursp
()));
if
(
val
)
{
genop
(
s
,
MKOP_AB
(
OP_MOVE
,
vsp
,
cursp
()));
}
pop
();
}
else
if
(
val
)
{
genop
(
s
,
MKOP_AB
(
OP_MOVE
,
vsp
,
cursp
()));
}
pop
();
idx
=
new_msym
(
s
,
attrsym
(
s
,
sym
(
tree
->
car
->
cdr
->
cdr
->
car
)));
genop
(
s
,
MKOP_ABC
(
OP_SEND
,
cursp
(),
idx
,
callargs
));
}
}
break
;
break
;
case
NODE_SUPER
:
case
NODE_SUPER
:
...
...
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