Issue jashkenas#959 (and countless others) Removing the loop-block-scoped magic for once and for all.

Author: jashkenas

Cakefile

@@ -151,11 +151,13 @@ runTests = (CoffeeScript) ->
   failures    = []
 
   # Mix in the assert module globally, to make it available for tests.
-  for name, func of require 'assert'
+  addGlobal = (name, func) ->
     global[name] = ->
       passedTests += 1
       func arguments...
 
+  addGlobal name, func for name, func of require 'assert'
+
   # Convenience aliases.
   global.eq = global.strictEqual
   global.CoffeeScript = CoffeeScript

lib/command.js

@@ -1441,7 +1441,6 @@ exports.For = class For extends Base
   # some cannot.
   compileNode: (o) ->
     body          = Expressions.wrap [@body]
-    hasCode       = body.contains (node) -> node instanceof Code
     hasPure       = last(body.expressions)?.containsPureStatement()
     source        = if @range then @source.base else @source
     scope         = o.scope
@@ -1476,8 +1475,6 @@ exports.For = class For extends Base
       body          = Push.wrap rvar, body
     if @guard
       body          = Expressions.wrap [new If @guard, body]
-    if hasCode
-      body          = Closure.wrap(body, yes, not @returns)
     varPart         = "\n#{idt1}#{namePart};" if namePart
     if @object
       forPart       = "#{ivar} in #{svar}"

lib/nodes.js

@@ -73,63 +73,14 @@ ok 2 of evens
 all = 1
 
 
-# Ensure that the closure wrapper preserves local variables.
-obj = {}
-
-for method in ['one', 'two', 'three']
-  obj[method] = ->
-    "I'm " + method
-
-ok obj.one()   is "I'm one"
-ok obj.two()   is "I'm two"
-ok obj.three() is "I'm three"
-
+# Index values at the end of a loop.
 i = 0
 for i in [1..3]
   -> 'func'
   break if false
 ok i is 4
 
 
-# Ensure that local variables are closed over for range comprehensions.
-funcs = for i in [1..3]
-  -> -i
-
-ok (func() for func in funcs).join(' ') is '-1 -2 -3'
-ok i is 4
-
-
-# Even when referenced in the filter.
-list = ['one', 'two', 'three']
-
-methods = for num, i in list when num isnt 'two' and i isnt 1
-  -> num + ' ' + i
-
-ok methods.length is 2
-ok methods[0]() is 'one 0'
-ok methods[1]() is 'three 2'
-
-
-# Even a convoluted one.
-funcs = []
-
-for i in [1..3]
-  x = i * 2
-  ((z)->
-    funcs.push -> z + ' ' + i
-  )(x)
-
-ok (func() for func in funcs).join(', ') is '2 1, 4 2, 6 3'
-
-funcs = []
-
-results = for i in [1..3]
-  z = (x * 3 for x in [1..i])
-  ((a, b, c) -> [a, b, c].join(' ')).apply this, z
-
-ok results.join(', ') is '3  , 3 6 , 3 6 9'
-
-
 # Naked ranges are expanded into arrays.
 array = [0..10]
 ok(num % 2 is 0 for num in array by 2)
@@ -221,15 +172,6 @@ odds = while i--
 ok odds.join(', ') is '5, 3, 1'
 
 
-# Nested shared scopes.
-foo = ->
-  for i in [0..7]
-    for j in [0..7]
-      -> i + j
-
-eq foo()[3][4](), 7
-
-
 # Issue #897: Ensure that plucked function variables aren't leaked.
 facets = {}
 list = ['one', 'two']
@@ -249,12 +191,3 @@ for d in a.b?.c
   e = d
 
 eq e, 3
-
-
-# Issue #948. Capturing loop variables.
-funcs = []
-for y in [1, 2, 3]
-  z = y
-  funcs.push -> "y is #{y} and z is #{z}"
-
-eq funcs[1](), "y is 2 and z is 2"