Merge branch 'bugfix-1436' of git://github.com/thejh/coffee-script in…

…to thejh_1448
jashkenas · Jun 30, 2011 · f6fcfa8 · f6fcfa8
2 parents c93fc3e + 9699059
commit f6fcfa8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/lib/lexer.js b/lib/lexer.js
diff --git a/src/lexer.coffee b/src/lexer.coffee
@@ -84,8 +84,7 @@ exports.Lexer = class Lexer
       not prev.spaced and prev[0] is '@')
     tag = 'IDENTIFIER'
 
-    if id in JS_KEYWORDS or
-       not forcedIdentifier and id in COFFEE_KEYWORDS
+    if not forcedIdentifier and (id in JS_KEYWORDS or id in COFFEE_KEYWORDS)
       tag = id.toUpperCase()
       if tag is 'WHEN' and @tag() in LINE_BREAK
         tag = 'LEADING_WHEN'

diff --git a/test/objects.coffee b/test/objects.coffee
@@ -215,3 +215,6 @@ test "#1274: `{} = a()` compiles to `false` instead of `a()`", ->
   fn = -> a = true
   {} = fn()
   ok a
+
+test "#1436: `for` etc. work as normal property names", ->
+  doesNotThrow -> CoffeeScript.compile "foo.for = 'bar' of foo"