From 9ba1ffde215a73b9e59eaeffe6f53780d64cd8de Mon Sep 17 00:00:00 2001
From: Jeremy Ashkenas <jashkenas@gmail.com>
Date: Sat, 19 Dec 2009 00:45:36 -0500
Subject: [PATCH] making the each fixture a little more like underscore, and
 avoiding passing assignment into functions from the outside

---
 lib/coffee_script/nodes.rb |  3 ++-
 test/fixtures/each.cs      |  9 ++++++---
 test/fixtures/each.js      | 20 +++++++++-----------
 test/fixtures/each.tokens  |  2 +-
 4 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/lib/coffee_script/nodes.rb b/lib/coffee_script/nodes.rb
index 22633bf3..7825dbca 100644
--- a/lib/coffee_script/nodes.rb
+++ b/lib/coffee_script/nodes.rb
@@ -338,7 +338,8 @@ module CoffeeScript
     def compile(indent, scope, opts={})
       scope = Scope.new(scope)
       @params.each {|id| scope.find(id.to_s) }
-      opts  = opts.merge(:return => true)
+      opts[:return] = true
+      opts.delete(:assign)
       code  = @body.compile(indent + TAB, scope, opts)
       write("function(#{@params.join(', ')}) {\n#{code}\n#{indent}}")
     end
diff --git a/test/fixtures/each.cs b/test/fixtures/each.cs
index 76c0e385..5a345f12 100644
--- a/test/fixtures/each.cs
+++ b/test/fixtures/each.cs
@@ -3,9 +3,12 @@
 _.each: obj, iterator, context =>
   index: 0
   try
-    return obj.forEach(iterator, context) if obj.forEach
-    return iterator.call(context, item, i, obj) for item, i in obj. if _.isArray(obj) or _.isArguments(obj)
-    iterator.call(context, obj[key], key, obj) for key in _.keys(obj).
+    if obj.forEach
+      obj.forEach(iterator, context)
+    else if _.isArray(obj) or _.isArguments(obj)
+      iterator.call(context, item, i, obj) for item, i in obj.
+    else
+      iterator.call(context, obj[key], key, obj) for key in _.keys(obj)..
   catch e
     throw e if e aint breaker.
   obj.
\ No newline at end of file
diff --git a/test/fixtures/each.js b/test/fixtures/each.js
index afdafb7e..56f0fabc 100644
--- a/test/fixtures/each.js
+++ b/test/fixtures/each.js
@@ -3,22 +3,20 @@
     var index = 0;
     try {
       if (obj.forEach) {
-        return obj.forEach(iterator, context);
-      }
-      if (_.isArray(obj) || _.isArguments(obj)) {
+        obj.forEach(iterator, context);
+      } else if (_.isArray(obj) || _.isArguments(obj)) {
         var a = obj;
-        var d = [];
         for (var b=0, c=a.length; b<c; b++) {
           var item = a[b];
           var i = b;
-          d[b] = iterator.call(context, item, i, obj);
+          iterator.call(context, item, i, obj);
+        }
+      } else {
+        var d = _.keys(obj);
+        for (var e=0, f=d.length; e<f; e++) {
+          var key = d[e];
+          iterator.call(context, obj[key], key, obj);
         }
-        return d;
-      }
-      var e = _.keys(obj);
-      for (var f=0, g=e.length; f<g; f++) {
-        var key = e[f];
-        iterator.call(context, obj[key], key, obj);
       }
     } catch (e) {
       if (e !== breaker) {
diff --git a/test/fixtures/each.tokens b/test/fixtures/each.tokens
index bbaa3432..5e50931f 100644
--- a/test/fixtures/each.tokens
+++ b/test/fixtures/each.tokens
@@ -1 +1 @@
-[["\n", "\n"], [:IDENTIFIER, "_"], [:PROPERTY_ACCESS, "."], [:IDENTIFIER, "each"], [":", ":"], [:PARAM, "obj"], [",", ","], [:PARAM, "iterator"], [",", ","], [:PARAM, "context"], ["=>", "=>"], ["\n", "\n"], [:IDENTIFIER, "index"], [":", ":"], [:NUMBER, "0"], ["\n", "\n"], [:TRY, "try"], ["\n", "\n"], [:RETURN, "return"], [:IDENTIFIER, "obj"], [:PROPERTY_ACCESS, "."], [:IDENTIFIER, "forEach"], ["(", "("], [:IDENTIFIER, "iterator"], [",", ","], [:IDENTIFIER, "context"], [")", ")"], [:IF, "if"], [:IDENTIFIER, "obj"], [:PROPERTY_ACCESS, "."], [:IDENTIFIER, "forEach"], ["\n", "\n"], [:RETURN, "return"], [:IDENTIFIER, "iterator"], [:PROPERTY_ACCESS, "."], [:IDENTIFIER, "call"], ["(", "("], [:IDENTIFIER, "context"], [",", ","], [:IDENTIFIER, "item"], [",", ","], [:IDENTIFIER, "i"], [",", ","], [:IDENTIFIER, "obj"], [")", ")"], [:FOR, "for"], [:IDENTIFIER, "item"], [",", ","], [:IDENTIFIER, "i"], [:IN, "in"], [:IDENTIFIER, "obj"], [".", "."], [:IF, "if"], [:IDENTIFIER, "_"], [:PROPERTY_ACCESS, "."], [:IDENTIFIER, "isArray"], ["(", "("], [:IDENTIFIER, "obj"], [")", ")"], [:OR, "or"], [:IDENTIFIER, "_"], [:PROPERTY_ACCESS, "."], [:IDENTIFIER, "isArguments"], ["(", "("], [:IDENTIFIER, "obj"], [")", ")"], ["\n", "\n"], [:IDENTIFIER, "iterator"], [:PROPERTY_ACCESS, "."], [:IDENTIFIER, "call"], ["(", "("], [:IDENTIFIER, "context"], [",", ","], [:IDENTIFIER, "obj"], ["[", "["], [:IDENTIFIER, "key"], ["]", "]"], [",", ","], [:IDENTIFIER, "key"], [",", ","], [:IDENTIFIER, "obj"], [")", ")"], [:FOR, "for"], [:IDENTIFIER, "key"], [:IN, "in"], [:IDENTIFIER, "_"], [:PROPERTY_ACCESS, "."], [:IDENTIFIER, "keys"], ["(", "("], [:IDENTIFIER, "obj"], [")", ")"], [".", "."], ["\n", "\n"], [:CATCH, "catch"], [:IDENTIFIER, "e"], ["\n", "\n"], [:THROW, "throw"], [:IDENTIFIER, "e"], [:IF, "if"], [:IDENTIFIER, "e"], [:AINT, "aint"], [:IDENTIFIER, "breaker"], [".", "."], ["\n", "\n"], [:IDENTIFIER, "obj"], [".", "."]]
\ No newline at end of file
+[["\n", "\n"], [:IDENTIFIER, "_"], [:PROPERTY_ACCESS, "."], [:IDENTIFIER, "each"], [":", ":"], [:PARAM, "obj"], [",", ","], [:PARAM, "iterator"], [",", ","], [:PARAM, "context"], ["=>", "=>"], ["\n", "\n"], [:IDENTIFIER, "index"], [":", ":"], [:NUMBER, "0"], ["\n", "\n"], [:TRY, "try"], ["\n", "\n"], [:IF, "if"], [:IDENTIFIER, "obj"], [:PROPERTY_ACCESS, "."], [:IDENTIFIER, "forEach"], ["\n", "\n"], [:IDENTIFIER, "obj"], [:PROPERTY_ACCESS, "."], [:IDENTIFIER, "forEach"], ["(", "("], [:IDENTIFIER, "iterator"], [",", ","], [:IDENTIFIER, "context"], [")", ")"], ["\n", "\n"], [:ELSE, "else"], [:IF, "if"], [:IDENTIFIER, "_"], [:PROPERTY_ACCESS, "."], [:IDENTIFIER, "isArray"], ["(", "("], [:IDENTIFIER, "obj"], [")", ")"], [:OR, "or"], [:IDENTIFIER, "_"], [:PROPERTY_ACCESS, "."], [:IDENTIFIER, "isArguments"], ["(", "("], [:IDENTIFIER, "obj"], [")", ")"], ["\n", "\n"], [:IDENTIFIER, "iterator"], [:PROPERTY_ACCESS, "."], [:IDENTIFIER, "call"], ["(", "("], [:IDENTIFIER, "context"], [",", ","], [:IDENTIFIER, "item"], [",", ","], [:IDENTIFIER, "i"], [",", ","], [:IDENTIFIER, "obj"], [")", ")"], [:FOR, "for"], [:IDENTIFIER, "item"], [",", ","], [:IDENTIFIER, "i"], [:IN, "in"], [:IDENTIFIER, "obj"], [".", "."], ["\n", "\n"], [:ELSE, "else"], ["\n", "\n"], [:IDENTIFIER, "iterator"], [:PROPERTY_ACCESS, "."], [:IDENTIFIER, "call"], ["(", "("], [:IDENTIFIER, "context"], [",", ","], [:IDENTIFIER, "obj"], ["[", "["], [:IDENTIFIER, "key"], ["]", "]"], [",", ","], [:IDENTIFIER, "key"], [",", ","], [:IDENTIFIER, "obj"], [")", ")"], [:FOR, "for"], [:IDENTIFIER, "key"], [:IN, "in"], [:IDENTIFIER, "_"], [:PROPERTY_ACCESS, "."], [:IDENTIFIER, "keys"], ["(", "("], [:IDENTIFIER, "obj"], [")", ")"], [".", "."], [".", "."], ["\n", "\n"], [:CATCH, "catch"], [:IDENTIFIER, "e"], ["\n", "\n"], [:THROW, "throw"], [:IDENTIFIER, "e"], [:IF, "if"], [:IDENTIFIER, "e"], [:AINT, "aint"], [:IDENTIFIER, "breaker"], [".", "."], ["\n", "\n"], [:IDENTIFIER, "obj"], [".", "."]]
\ No newline at end of file