Correct destructured parameter default evaluation order with an incre…

…menting variable (or more generally any complicated parameter that isComplex)
jashkenas · Jan 24, 2017 · c4b6d27 · c4b6d27
1 parent dbd8274
commit c4b6d27
Show file tree

Hide file tree

Showing 10 changed files with 67 additions and 33 deletions.
diff --git a/lib/coffee-script/browser.js b/lib/coffee-script/browser.js
diff --git a/lib/coffee-script/coffee-script.js b/lib/coffee-script/coffee-script.js
diff --git a/lib/coffee-script/lexer.js b/lib/coffee-script/lexer.js
diff --git a/lib/coffee-script/nodes.js b/lib/coffee-script/nodes.js
diff --git a/lib/coffee-script/optparse.js b/lib/coffee-script/optparse.js
diff --git a/lib/coffee-script/repl.js b/lib/coffee-script/repl.js
diff --git a/lib/coffee-script/scope.js b/lib/coffee-script/scope.js
diff --git a/lib/coffee-script/sourcemap.js b/lib/coffee-script/sourcemap.js
diff --git a/src/nodes.coffee b/src/nodes.coffee
@@ -2112,7 +2112,7 @@ exports.Param = class Param extends Base
     @reference = node
 
   isComplex: ->
-    @name.isComplex() or @value instanceof Call
+    @name.isComplex() or (@value?.isComplex? and @value.isComplex())
 
   # Iterates the name or names of a `Param`.
   # In a sense, a destructured parameter represents multiple JS parameters. This

diff --git a/test/functions.coffee b/test/functions.coffee
@@ -342,7 +342,12 @@ test "#1038 Optimize trailing return statements", ->
                                                    return
                                                  """)
 
-test "#4406 Destructured parameter default evaluation order", ->
+test "#4406 Destructured parameter default evaluation order with incrementing variable", ->
+  i = 0
+  f = ({ a = ++i }, b = ++i) -> [a, b]
+  arrayEq f({}), [1, 2]
+
+test "#4406 Destructured parameter default evaluation order with generator function", ->
   current = 0
   next    = -> ++current
   foo = ({ a = next() }, b = next()) -> [ a, b ]