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

lexer: reorganized JS_KEYWORDS

Browse source
This commit is contained in:
satyr 2010-10-12 16:23:28 +09:00
parent 43613498db
commit 54101a1c9b
2 changed files with 8 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/lexer.js
View file

@ -485,7 +485,7 @@
i += 1;
}
if (levels.length) {
throw new Error("SyntaxError: Unterminated " + (levels.pop()[0]) + " starting on line " + (this.line + 1));
throw SyntaxError("Unterminated " + (levels.pop()[0]) + " starting on line " + (this.line + 1));
}
return !i ? false : str.slice(0, i);
};
@ -580,7 +580,7 @@
};
return Lexer;
})();
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 = ['true', 'false', 'null', 'this', 'new', 'delete', 'typeof', 'in', 'instanceof', 'return', 'throw', 'break', 'continue', 'debugger', 'if', 'else', 'switch', 'for', 'while', 'try', 'catch', 'finally', 'class', 'extends', 'super'];
COFFEE_KEYWORDS = ['then', 'unless', 'until', 'loop', 'of', 'by', 'when'];
for (op in (COFFEE_ALIASES = {
and: '&&',

16
src/lexer.coffee
View file

@ -425,7 +425,7 @@ exports.Lexer = class Lexer
break if not levels.length
i += 1
if levels.length
throw new Error "SyntaxError: Unterminated #{levels.pop()[0]} starting on line #{@line + 1}"
throw SyntaxError "Unterminated #{levels.pop()[0]} starting on line #{@line + 1}"
if not i then false else str[0...i]
# Expand variables and expressions inside double-quoted strings using
@ -508,15 +508,11 @@ exports.Lexer = class Lexer
# Keywords that CoffeeScript shares in common with JavaScript.
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'
'true', 'false', 'null', 'this'
'new', 'delete', 'typeof', 'in', 'instanceof'
'return', 'throw', 'break', 'continue', 'debugger'
'if', 'else', 'switch', 'for', 'while', 'try', 'catch', 'finally'
'class', 'extends', 'super'
]
# CoffeeScript-only keywords.