proper super compilation

clkao · Oct 17, 2012 · 3c8e962 · 3c8e962
1 parent 33a9c7e
commit 3c8e962
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 6 deletions.
diff --git a/lib/cscodegen.js b/lib/cscodegen.js
diff --git a/src/cscodegen.coffee b/src/cscodegen.coffee
@@ -38,6 +38,7 @@ do (exports = exports ? this.cscodegen = {}) ->
       when 'PreIncrementOp', 'PreDecrementOp', 'UnaryPlusOp', 'UnaryNegateOp', 'LogicalNotOp', 'BitNotOp', 'DoOp', 'TypeofOp', 'DeleteOp'
         needsParensWhenOnLeft ast.expression
       when 'FunctionApplication' then ast.arguments.length > 0
+      when 'Super' then yes
       else no
 
   eq = (nodeA, nodeB) ->
@@ -652,9 +653,13 @@ do (exports = exports ? this.cscodegen = {}) ->
 
       when 'Super'
         options.ancestors = [ast, options.ancestors...]
-        if ast.arguments
-          generate new CS.FunctionApplication (new CS.Identifier 'super'),
-            ast.arguments
+        if ast.arguments.length
+          args = for a, i in ast.arguments
+            arg = generate a, options
+            arg = parens arg if ((needsParensWhenOnLeft a) and i + 1 isnt ast.arguments.length) or (a.className is 'Function' and i is 0)
+            arg
+          _argList = args.join ', '
+          "super #{_argList}"
         else
           'super ...'
 

diff --git a/test/classes.coffee b/test/classes.coffee
@@ -10,7 +10,7 @@ suite 'Classes', ->
     @this = new CS.This '@'
 
   test 'super', ->
-    eq 'super ...', generate new CS.Super()
+    eq 'super ...', generate new CS.Super []
     eq 'super x, y', generate new CS.Super [@x, @y]
 
   test 'no bodied classes', ->