Merge pull request #3322 from xixixao/issue1099

Fix #1099, remove in empty array optimization
jashkenas · Jan 23, 2014 · b00962d · b00962d
2 parents d2f90d2 + 26dcf02
commit b00962d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/lib/coffee-script/nodes.js b/lib/coffee-script/nodes.js
diff --git a/src/nodes.coffee b/src/nodes.coffee
@@ -1719,7 +1719,7 @@ exports.In = class In extends Base
   invert: NEGATE
 
   compileNode: (o) ->
-    if @array instanceof Value and @array.isArray()
+    if @array instanceof Value and @array.isArray() and @array.base.objects.length
       for obj in @array.base.objects when obj instanceof Splat
         hasSplat = yes
         break
@@ -1728,7 +1728,6 @@ exports.In = class In extends Base
     @compileLoopTest o
 
   compileOrTest: (o) ->
-    return [@makeCode("#{!!@negated}")] if @array.base.objects.length is 0
     [sub, ref] = @object.cache o, LEVEL_OP
     [cmp, cnj] = if @negated then [' !== ', ' && '] else [' === ', ' || ']
     tests = []

diff --git a/test/operators.coffee b/test/operators.coffee
@@ -218,6 +218,10 @@ test "#1714: lexer bug with raw range `for` followed by `in`", ->
 test "#1099: statically determined `not in []` reporting incorrect result", ->
   ok 0 not in []
 
+test "#1099: make sure expression tested gets evaluted when array is empty", ->
+  a = 0
+  (do -> a = 1) in []
+  eq a, 1
 
 # Chained Comparison