Merge pull request #860 from summivox/fix-empty-splat

Fix #858 Inconsistent empty splat assignment
gkz · Mar 2, 2016 · 62a8eb5 · 62a8eb5
2 parents 382c7b7 + f18a91c
commit 62a8eb5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/ast.ls b/src/ast.ls
@@ -1660,10 +1660,14 @@ class exports.Assign extends Node
                     continue if skip and i+2 is len
                     start = i+1
                     @temps = [ivar = o.scope.temporary \i]
-                    val = if skip then node = Var ivar; Var val else
-                        Arr.wrap JS "#i < (#ivar = #val)
-                                  \ ? #{ util \slice }.call(#rite, #i, #ivar)
-                                  \ : (#ivar = #i, [])"
+                    val = switch
+                    | skip
+                        Arr.wrap JS "#i < (#ivar = #val) ? #i : (#ivar = #i)"
+                    | _
+                        Arr.wrap JS do
+                            "#i < (#ivar = #val)
+                            \ ? #{ util \slice }.call(#rite, #i, #ivar)
+                            \ : (#ivar = #i, [])"
             else
                 (inc = ivar) and start < i and inc += " + #{ i - start }"
                 val = Chain rcache||=Literal(rite), [Index JS inc || i]

diff --git a/test/splat.ls b/test/splat.ls
@@ -102,6 +102,12 @@ eq b, 2
 eq a, 1
 eq b, 5
 
+# [LiveScript#858](https://github.com/gkz/LiveScript/issues/858)
+[a, ..., b, c, d] = [1 2 3]
+eq a, 1
+eq b, 2
+eq c, 3
+
 eq '''
 (function(){
   var a;