Call AST (#5117)

* op ast * test expected errors * use new ast methods * remove unused abstraction * logical ? * fix rebase * follow convention * fixes from code review * test helper naming * always convert new to Call * new cases * don't mutate locationData * updated grammar * tests * Rebuild * always expose generated * todo for OptionalMemberExpression
jashkenas · Oct 15, 2018 · fe7377a · fe7377a
1 parent e934a42
commit fe7377a
Show file tree

Hide file tree

Showing 10 changed files with 328 additions and 78 deletions.
diff --git a/lib/coffeescript/grammar.js b/lib/coffeescript/grammar.js
diff --git a/lib/coffeescript/nodes.js b/lib/coffeescript/nodes.js
diff --git a/lib/coffeescript/parser.js b/lib/coffeescript/parser.js
diff --git a/lib/coffeescript/rewriter.js b/lib/coffeescript/rewriter.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/grammar.coffee b/src/grammar.coffee
@@ -520,7 +520,7 @@ grammar =
   # The list of arguments to a function call.
   Arguments: [
     o 'CALL_START CALL_END',                    -> []
-    o 'CALL_START ArgList OptComma CALL_END',   -> $2
+    o 'CALL_START ArgList OptComma CALL_END',   -> $2.implicit = $1.generated; $2
   ]
 
   # A reference to the *this* current object.

diff --git a/src/nodes.coffee b/src/nodes.coffee
@@ -1285,6 +1285,7 @@ exports.Call = class Call extends Base
   constructor: (@variable, @args = [], @soak, @token) ->
     super()
 
+    @implicit = @args.implicit
     @isNew = no
     if @variable instanceof Value and @variable.isNotCallable()
       @variable.error "literal is not a function"
@@ -1426,6 +1427,19 @@ exports.Call = class Call extends Base
       fragments.push @makeCode(' />')
     fragments
 
+  astType: ->
+    if @isNew
+      'NewExpression'
+    else
+      'CallExpression'
+
+  astProperties: ->
+    return
+      callee: @variable.ast()
+      arguments: arg.ast() for arg in @args
+      optional: !!@soak
+      implicit: !!@implicit
+
 #### Super
 
 # Takes care of converting `super()` calls into calls against the prototype's

diff --git a/src/rewriter.coffee b/src/rewriter.coffee
@@ -655,7 +655,7 @@ exports.Rewriter = class Rewriter
   # primitive string and separately passing any expected token data properties
   exposeTokenDataToGrammar: ->
     @scanTokens (token, i) ->
-      if token.data and Object.keys(token.data).length or token[0] is 'JS' and token.generated
+      if token.generated or (token.data and Object.keys(token.data).length isnt 0)
         token[1] = new String token[1]
         token[1][key] = val for own key, val of (token.data ? {})
         token[1].generated = yes if token.generated