Merge pull request jashkenas#1868 from geraldalewis/1840_invocation_p…

…rototype_prop_access jashkenas#1840 Invocation Prototype Prop Access
rymohr · Nov 14, 2011 · 55521a2 · 55521a2
2 parents d0b8cde + 8762e37
commit 55521a2
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/lib/coffee-script/grammar.js b/lib/coffee-script/grammar.js
diff --git a/lib/coffee-script/parser.js b/lib/coffee-script/parser.js
diff --git a/src/grammar.coffee b/src/grammar.coffee
@@ -218,7 +218,7 @@ grammar =
   SimpleAssignable: [
     o 'Identifier',                             -> new Value $1
     o 'Value Accessor',                         -> $1.add $2
-    o 'Invocation Accessor',                    -> new Value $1, [$2]
+    o 'Invocation Accessor',                    -> new Value $1, [].concat $2
     o 'ThisProperty'
   ]
 

diff --git a/test/function_invocation.coffee b/test/function_invocation.coffee
@@ -506,3 +506,15 @@ test "#1416: don't omit one 'new' when compiling 'new new fn()()'", ->
   eq obj.prop, nonce
   eq obj.a, argNonceA
   eq obj.b, argNonceB
+
+test "#1840: accessing the `prototype` after function invocation should compile", ->
+  doesNotThrow -> CoffeeScript.compile 'fn()::prop'
+
+  nonce = {}
+  class Test then id: nonce
+
+  dotAccess = -> Test::
+  protoAccess = -> Test
+
+  eq dotAccess().id, nonce
+  eq protoAccess()::id, nonce