add IINFE support (do fn = -> ...); fixes #43 and #73

Author: michaelficarra

lib/coffee-script/compiler.js

@@ -823,17 +823,22 @@ class exports.Compiler
         new JS.BinaryExpression '&&', typeofTest, nullTest
       else nullTest
     ]
-    [CS.DoOp, ({expression, compile}) ->
-      args = []
-      if @expression.instanceof CS.Function
-        args = for param, index in @expression.parameters
+    [CS.DoOp, do ->
+      deriveArgsFromParams = (params) ->
+        args = for param, index in params
           switch
             when param.instanceof CS.DefaultParam
-              @expression.parameters[index] = param.param
+              params[index] = param.param
               param.default
             when param.instanceof CS.Identifier, CS.MemberAccessOp then param
             else helpers.undef()
-      compile new CS.FunctionApplication @expression, args
+      ({expression, compile}) ->
+        args = []
+        if (@expression.instanceof CS.AssignOp) and @expression.expression.instanceof CS.Function
+          args = deriveArgsFromParams @expression.expression.parameters
+        else if @expression.instanceof CS.Function
+          args = deriveArgsFromParams @expression.parameters
+        compile new CS.FunctionApplication @expression, args
     ]
     [CS.Return, ({expression: e}) -> new JS.ReturnStatement expr e]
     [CS.Break, -> new JS.BreakStatement]

lib/coffee-script/parser.js

@@ -370,6 +370,9 @@ prefixExpression
   / "-" ws:_ e:(expressionworthy / prefixExpression) { return new CS.UnaryNegateOp(e).r('-' + ws + e.raw).p(line, column, offset); }
   / o:("!" / NOT) ws:_ e:(expressionworthy / prefixExpression) { return new CS.LogicalNotOp(e).r(o + ws + e.raw).p(line, column, offset); }
   / "~" ws:_ e:(expressionworthy / prefixExpression) { return new CS.BitNotOp(e).r('~' + ws + e.raw).p(line, column, offset); }
+  / DO ws0:_ !unassignable a:identifier ws1:_ "=" ws2:_ f:functionLiteral {
+      return new CS.DoOp(new CS.AssignOp(a, f)).r('do' + ws0 + a.raw + ws1 + '+' + ws2 + f.raw).p(line, column, offset);
+    }
   / DO ws:_ e:(expressionworthy / prefixExpression) { return new CS.DoOp(e).r('do' + ws + e.raw).p(line, column, offset); }
   / TYPEOF ws:_ e:(expressionworthy / prefixExpression) { return new CS.TypeofOp(e).r('typeof' + ws + e.raw).p(line, column, offset); }
   / DELETE ws:_ e:(expressionworthy / prefixExpression) { return new CS.DeleteOp(e).r('delete' + ws + e.raw).p(line, column, offset); }

src/compiler.coffee

@@ -454,10 +454,10 @@ suite 'Function Invocation', ->
       eq two, 2
       eq three, 3
 
-    #ret = do func = (two) ->
-    #  eq two, 2
-    #  func
-    #eq ret, func
+    ret = do func = (two) ->
+      eq two, 2
+      func
+    eq ret, func
 
   test "soaked function application", ->
     nonce = {}