diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2013-10-01 08:07:19 -0700 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2013-10-01 08:07:19 -0700 |
| commit | 1ba6995a7a07216c2c1fc658f2406f6817e2a118 (patch) | |
| tree | f29425133fa0ef4cbb9758f16625c6c7eb47c764 /src | |
| parent | e870ed708b0148c6fb6171c6102d3e7fa52d0964 (diff) | |
| parent | af5bec1fbc2fd2047d40524d3bfedea77de318b2 (diff) | |
| download | mruby-1ba6995a7a07216c2c1fc658f2406f6817e2a118.tar.gz mruby-1ba6995a7a07216c2c1fc658f2406f6817e2a118.zip | |
Merge pull request #1521 from Fleurer/issue-1519
fix #1519
Diffstat (limited to 'src')
| -rw-r--r-- | src/codegen.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/codegen.c b/src/codegen.c index b77ead3c3..bb479842c 100644 --- a/src/codegen.c +++ b/src/codegen.c @@ -684,16 +684,23 @@ static int gen_values(codegen_scope *s, node *t, int val) { int n = 0; + int is_splat; while (t) { - if (n >= 127 || (intptr_t)t->car->car == NODE_SPLAT) { // splat mode + is_splat = (intptr_t)t->car->car == NODE_SPLAT; // splat mode + if (n >= 127 || is_splat) { if (val) { pop_n(n); genop(s, MKOP_ABC(OP_ARRAY, cursp(), cursp(), n)); push(); codegen(s, t->car, VAL); pop(); pop(); - genop(s, MKOP_AB(OP_ARYCAT, cursp(), cursp()+1)); + if (is_splat) { + genop(s, MKOP_AB(OP_ARYCAT, cursp(), cursp()+1)); + } + else { + genop(s, MKOP_AB(OP_ARYPUSH, cursp(), cursp()+1)); + } t = t->cdr; while (t) { push(); |