merging master

This commit is contained in:
Jeremy Ashkenas
2010-02-05 22:02:11 -05:00
6 changed files with 1390 additions and 1404 deletions

View File

@@ -15,8 +15,7 @@ module CoffeeScript
"for", "in", "of", "by", "where", "while",
"delete", "instanceof", "typeof",
"switch", "when",
"super", "extends",
"arguments"]
"super", "extends"]
# Token matching regexes.
IDENTIFIER = /\A([a-zA-Z$_](\w|\$)*)/