summaryrefslogtreecommitdiffhomepage
path: root/src/codegen.c
diff options
context:
space:
mode:
authorKouhei Sutou <[email protected]>2014-12-23 21:16:01 +0900
committerKouhei Sutou <[email protected]>2014-12-23 21:16:01 +0900
commit5ec676aa37b1c6e345b29ffa02ea8210b7a94da5 (patch)
treeb2b7cd63cba1d80fbb9226aeacb10ae54e4f7b0a /src/codegen.c
parente618438882606c8318bcc4eae2c47ce8ab82d6aa (diff)
downloadmruby-5ec676aa37b1c6e345b29ffa02ea8210b7a94da5.tar.gz
mruby-5ec676aa37b1c6e345b29ffa02ea8210b7a94da5.zip
Fix splat and multiple assignments
Case1: From variable Code: a = [1, 2, 3, 4, 5] b, c, *d = a p [a, b, c, d] Before: [[1, 2, 3, 4, 5], 1, 2, []] After: [[1, 2, 3, 4, 5], 1, 2, [3, 4, 5]] Ruby: [[1, 2, 3, 4, 5], 1, 2, [3, 4, 5]] Case2: From variables Code: a = [1, 2, 3] b = [4, 5, 6, 7] c, d, *e, f, g = *a, *b p [a, b, c, d, e, f, g] Before: [[1, 2, 3], [4, 5, 6, 7], 1, 2, [], 6, 7] After: [[1, 2, 3], [4, 5, 6, 7], 1, 2, [3, 4, 5], 6, 7] Ruby: [[1, 2, 3], [4, 5, 6, 7], 1, 2, [3, 4, 5], 6, 7] Case 3: "for" Code: a = [1, 2, 3, 4, 5, 6, 7] for b, c, *d, e, f in [a] do p [a, b, c, d, e, f] end Before: [[1, 2, 3, 4, 5, 6, 7], 1, 2, [], nil, nil] After: [[1, 2, 3, 4, 5, 6, 7], 1, 2, [3, 4, 5], 6, 7] Ruby: [[1, 2, 3, 4, 5, 6, 7], 1, 2, [3, 4, 5], 6, 7]
Diffstat (limited to 'src/codegen.c')
-rw-r--r--src/codegen.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/codegen.c b/src/codegen.c
index d22892ecf..46d457885 100644
--- a/src/codegen.c
+++ b/src/codegen.c
@@ -1001,7 +1001,9 @@ gen_vmassignment(codegen_scope *s, node *tree, int rhs, int val)
}
if (val) {
genop(s, MKOP_AB(OP_MOVE, cursp(), rhs));
- push();
+ }
+ else {
+ pop();
}
genop(s, MKOP_ABC(OP_APOST, cursp(), n, post));
n = 1;
@@ -1016,6 +1018,7 @@ gen_vmassignment(codegen_scope *s, node *tree, int rhs, int val)
n++;
}
}
+ push();
}
}