summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2015-05-31 22:12:49 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2015-05-31 22:12:49 +0900
commitc80f500c68de24e114e4a7437db61ebfca7918f8 (patch)
treef35d538f78eefda4ed0b418b56a4be8ed9b2c9db
parent6a1978c7e1f58d3cda8cca390d65e5f64580b169 (diff)
parent5cd877be7f875546dcc03d80aeeddd4bbbcffe3d (diff)
downloadmruby-c80f500c68de24e114e4a7437db61ebfca7918f8.tar.gz
mruby-c80f500c68de24e114e4a7437db61ebfca7918f8.zip
Merge pull request #2814 from cremno/fix-masgn-nosplat-array-rhs-bug
fix masgn nosplat array rhs bug
-rw-r--r--src/codegen.c8
-rw-r--r--test/t/syntax.rb14
2 files changed, 21 insertions, 1 deletions
diff --git a/src/codegen.c b/src/codegen.c
index 6f1f75e88..be630b9a8 100644
--- a/src/codegen.c
+++ b/src/codegen.c
@@ -1615,8 +1615,14 @@ codegen(codegen_scope *s, node *tree, int val)
}
}
if (t->car) { /* rest (len - pre - post) */
- int rn = len - post - n;
+ int rn;
+ if (len < post + n) {
+ rn = 0;
+ }
+ else {
+ rn = len - post - n;
+ }
genop(s, MKOP_ABC(OP_ARRAY, cursp(), rhs+n, rn));
gen_assignment(s, t->car, cursp(), NOVAL);
n += rn;
diff --git a/test/t/syntax.rb b/test/t/syntax.rb
index 070fcbe3b..dc1a4a3b9 100644
--- a/test/t/syntax.rb
+++ b/test/t/syntax.rb
@@ -234,6 +234,20 @@ assert('multiple assignment (rest+post)') do
assert_equal 3, d
end
+assert('multiple assignment (nosplat array rhs)') do
+ a, *b = []
+ *c, d = [0]
+ e, *f, g = [1, 2]
+
+ assert_nil a
+ assert_equal [], b
+ assert_equal [], c
+ assert_equal 0, d
+ assert_equal 1, e
+ assert_equal [], f
+ assert_equal 2, g
+end
+
assert('Return values of case statements') do
a = [] << case 1
when 3 then 2