Fix a bug in returning a forloop as a list comprehension from autocb.…

… BUT, it's still kinda broken
maxtaco · Jan 24, 2012 · 186c64e · 186c64e
1 parent 173a069
commit 186c64e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 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
@@ -2653,7 +2653,10 @@ exports.For = class For extends While
         forPart    = "#{forVarPart}; #{ivar} < #{lvar}; #{stepPart}"
     if @returns
       resultPart   = "#{@tab}#{rvar} = [];\n"
-      returnResult = "\n#{@tab}return #{rvar};"
+      returnResult = if @tameHasAutocbFlag
+        "\n#{@tab}#{tame.const.autocb}(#{rvar}); return;"
+      else
+        "\n#{@tab}return #{rvar};"
       body.makeReturn rvar
     if @guard
       if body.expressions.length > 1

diff --git a/test/tame.coffee b/test/tame.coffee
@@ -522,3 +522,10 @@ atest 'nested for .. of .. loops', (cb) ->
       await delay defer()
       tot++
   cb(tot is 74, {})
+
+atest 'for + return + autocb', (cb) ->
+  bar = (autocb) ->
+    await delay defer()
+    (i for i in [0..10])
+  await bar defer v 
+  cb(v[3] is 3, {})