cleaned up and optimized fix for #1354 (d91ccd4)

jashkenas · May 16, 2011 · 2ac7435 · 2ac7435
1 parent 004f13f
commit 2ac7435
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/lib/nodes.js b/lib/nodes.js
diff --git a/src/nodes.coffee b/src/nodes.coffee
@@ -1349,12 +1349,13 @@ exports.In = class In extends Base
   invert: NEGATE
 
   compileNode: (o) ->
-    isArray = @array instanceof Value and @array.isArray()
-    splat   = obj for obj in @array.base.objects when obj instanceof Splat if isArray
-    if isArray and not splat
-      @compileOrTest o
-    else
-      @compileLoopTest o
+    if @array instanceof Value and @array.isArray()
+      for obj in @array.base.objects when obj instanceof Splat
+        hasSplat = yes
+        break
+      # `compileOrTest` only if we have an array literal with no splats
+      return @compileOrTest o unless hasSplat
+    @compileLoopTest o
 
   compileOrTest: (o) ->
     [sub, ref] = @object.cache o, LEVEL_OP