Merge branch 'master' of git://github.com/jashkenas/coffee-script

lib/coffee_script/grammar.y

@@ -321,7 +321,9 @@ rule
   # Looks a little confusing, check nodes.rb for the arguments to ForNode.
   For:
     Expression FOR
-      ForVariables ForSource          { result = ForNode.new(val[0], val[3][0], val[2][0], val[3][1], val[2][1]) }
+      ForVariables ForSource "."      { result = ForNode.new(val[0], val[3][0], val[2][0], val[3][1], val[2][1]) }
+  | FOR ForVariables ForSource
+      Terminator Expressions "."      { result = ForNode.new(val[4], val[2][0], val[1][0], val[2][1], val[1][1]) }
   ;
 
   # An array comprehension has variables for the current element and index.
@@ -332,9 +334,9 @@ rule
 
   # The source of the array comprehension can optionally be filtered.
   ForSource:
-    IN PureExpression "."             { result = [val[1]] }
+    IN PureExpression                 { result = [val[1]] }
   | IN PureExpression
-    IF Expression "."                 { result = [val[1], val[3]] }
+    IF Expression                     { result = [val[1], val[3]] }
   ;
 
   # Switch/When blocks.

lib/coffee_script/nodes.rb

@@ -571,6 +571,8 @@ module CoffeeScript
       if o[:return] || o[:assign]
         return_result = "#{o[:assign].compile(o)} = #{return_result}" if o[:assign]
         return_result = "return #{return_result}" if o[:return]
+        o.delete(:assign)
+        o.delete(:return)
         if @filter
           body = CallNode.new(ValueNode.new(LiteralNode.new(rvar), [AccessorNode.new('push')]), [@body])
           body = IfNode.new(@filter, body, nil, :statement => true)