kotovalexarian-likes-github/jashkenas--coffeescript
1
0
Fork 0
mirror of https://github.com/jashkenas/coffeescript.git synced 2022-11-09 12:23:24 -05:00
Code Releases Activity

Removing 'where' from COFFEE_KEYWORDS, and adding a missing equals sign to a test.

Browse source
This commit is contained in:
Jeremy Ashkenas 2010-09-27 10:16:34 -04:00
parent bc87d9ed3d
commit 3c848736a7
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/lexer.js
View file

@ -595,7 +595,7 @@
})(); })();
JS_KEYWORDS = ['if', 'else', 'true', 'false', 'new', 'return', 'try', 'catch', 'finally', 'throw', 'break', 'continue', 'for', 'in', 'while', 'delete', 'instanceof', 'typeof', 'switch', 'super', 'extends', 'class', 'this', 'null', 'debugger']; JS_KEYWORDS = ['if', 'else', 'true', 'false', 'new', 'return', 'try', 'catch', 'finally', 'throw', 'break', 'continue', 'for', 'in', 'while', 'delete', 'instanceof', 'typeof', 'switch', 'super', 'extends', 'class', 'this', 'null', 'debugger'];
COFFEE_ALIASES = ['and', 'or', 'is', 'isnt', 'not']; COFFEE_ALIASES = ['and', 'or', 'is', 'isnt', 'not'];
COFFEE_KEYWORDS = COFFEE_ALIASES.concat(['then', 'unless', 'until', 'loop', 'yes', 'no', 'on', 'off', 'of', 'by', 'where', 'when']); COFFEE_KEYWORDS = COFFEE_ALIASES.concat(['then', 'unless', 'until', 'loop', 'yes', 'no', 'on', 'off', 'of', 'by', 'when']);
RESERVED = ['case', 'default', 'do', 'function', 'var', 'void', 'with', 'const', 'let', 'enum', 'export', 'import', 'native', '__hasProp', '__extends', '__slice']; RESERVED = ['case', 'default', 'do', 'function', 'var', 'void', 'with', 'const', 'let', 'enum', 'export', 'import', 'native', '__hasProp', '__extends', '__slice'];
JS_FORBIDDEN = JS_KEYWORDS.concat(RESERVED); JS_FORBIDDEN = JS_KEYWORDS.concat(RESERVED);
IDENTIFIER = /^[a-zA-Z_$][\w$]*/; IDENTIFIER = /^[a-zA-Z_$][\w$]*/;

2
src/lexer.coffee
View file

@ -515,7 +515,7 @@ COFFEE_ALIASES = ['and', 'or', 'is', 'isnt', 'not']
COFFEE_KEYWORDS = COFFEE_ALIASES.concat [ COFFEE_KEYWORDS = COFFEE_ALIASES.concat [
'then', 'unless', 'until', 'loop' 'then', 'unless', 'until', 'loop'
'yes', 'no', 'on', 'off' 'yes', 'no', 'on', 'off'
'of', 'by', 'where', 'when' 'of', 'by', 'when'
] ]
# The list of keywords that are reserved by JavaScript, but not used, or are # The list of keywords that are reserved by JavaScript, but not used, or are

2
test/test_pattern_matching.coffee
View file

@ -141,7 +141,7 @@ deepEqual join2, join3
# Pattern matching doesn't clash with implicit block objects. # Pattern matching doesn't clash with implicit block objects.
obj = a: 101 obj = a: 101
func -> true func = -> true
if func func if func func
{a} = obj {a} = obj