Merge pull request jashkenas#2057 from geraldalewis/2054_{arguments}

Issue jashkenas#2054 "{arguments}"
fauzias · Jan 20, 2012 · 8ac440f · 8ac440f
2 parents 7c56da2 + c3a8a4f
commit 8ac440f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/lib/coffee-script/nodes.js b/lib/coffee-script/nodes.js
diff --git a/src/nodes.coffee b/src/nodes.coffee
@@ -993,7 +993,8 @@ exports.Assign = class Assign extends Base
   constructor: (@variable, @value, @context, options) ->
     @param = options and options.param
     @subpattern = options and options.subpattern
-    if name = @variable.unwrapAll().value in STRICT_PROSCRIBED
+    forbidden = (name = @variable.unwrapAll().value) in STRICT_PROSCRIBED
+    if forbidden and @context isnt 'object'
       throw SyntaxError "variable name may not be \"#{name}\""
 
   children: ['variable', 'value']

diff --git a/test/strict.coffee b/test/strict.coffee
@@ -117,6 +117,9 @@ test "`Future Reserved Word`s, `eval` and `arguments` restrictions", ->
     check "++{keyword}"
     check "{keyword}--"
     check "--{keyword}"
+  destruct = (keyword, check = strict) ->
+    check "{#{keyword}}"
+    check "o = {#{keyword}}"
   invoke = (keyword, check = strict) ->  
     check "#{keyword} yes"
     check "do #{keyword}"
@@ -134,6 +137,7 @@ test "`Future Reserved Word`s, `eval` and `arguments` restrictions", ->
   for keyword in future
     access   keyword
     assign   keyword
+    destruct keyword
     invoke   keyword
     fnDecl   keyword
     param    keyword
@@ -143,6 +147,7 @@ test "`Future Reserved Word`s, `eval` and `arguments` restrictions", ->
   for keyword in ['eval', 'arguments']
     access   keyword, strictOk
     assign   keyword
+    destruct keyword, strictOk
     invoke   keyword, strictOk
     fnDecl   keyword
     param    keyword