fix semiautovivification with slices

gkz · Feb 10, 2016 · 78ef417 · 78ef417
1 parent 63c19f5
commit 78ef417
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 5 deletions.
diff --git a/lib/ast.js b/lib/ast.js
diff --git a/src/ast.ls b/src/ast.ls
@@ -639,8 +639,6 @@ class exports.Chain extends Node
                 @head.called = true
             else if not @tails.1 and it.key?name is \prototype
                 @head.sproto = true
-        else if delete it.vivify
-            @head = Assign Chain(@head, @tails.splice 0, 9e9), that!, \= \||
         else if it instanceof Call and @tails.length is 1
         and bi and bi.op in logics = <[ && || xor ]>
             call = it
@@ -759,6 +757,7 @@ class exports.Chain extends Node
                 .add Call [context, Arr [this; Arr partial.args; Arr partial.partialized]]), post).compile o
         @carp 'invalid callee' if tails.0 instanceof Call and not head.is-callable!
         @expand-slice o
+        @expand-vivify!
         @expand-bind o
         @expand-splat o
         @expand-star o
@@ -837,6 +836,13 @@ class exports.Chain extends Node
                     i = 0
                 call <<< method: \.apply, args: [ctx or Literal \null; JS args]
 
+    expand-vivify: !->
+        {tails} = this
+        i = 0
+        while i < tails.length when delete tails[i++]vivify
+            @head = Assign Chain(@head, tails.splice 0, i), that!, \= \||
+            i = 0
+
     expand-bind: !(o) ->
         {tails} = this
         i = -1

diff --git a/test/chaining.ls b/test/chaining.ls
@@ -214,6 +214,11 @@ eq '0,1' ''+o.a.b
 eq '2,3' ''+o.a.c.d
 eq 5 o.a.b.e.f.4
 
+a = []
+eq 2 a{}[0, 1].length
+eq \object typeof a.0
+eq \object typeof a.1
+
 # Bang Call
 eq '' String!
 (-> ok true)!