github/coffeescript
1
1
Fork 0
mirror of https://github.com/jashkenas/coffeescript.git synced 2026-02-16 18:44:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

moving 'throw' to a slightly higher level of precedence

Browse Source
This commit is contained in:
Jeremy Ashkenas
2010-02-17 19:35:34 -05:00
parent 6a45d25777
commit fbfa12c733
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cakefile
View File

@@ -23,7 +23,7 @@ task 'build', 'build the CoffeeScript language from source', ->
task 'build:parser', 'rebuild the Jison parser', -> task 'build:parser', 'rebuild the Jison parser', ->
invoke 'build:compiler' invoke 'build'
parser: require('grammar').parser parser: require('grammar').parser
js: parser.generate() js: parser.generate()
parser_path: 'lib/parser.js' parser_path: 'lib/parser.js'

2
lib/grammar.js
View File

@@ -16,7 +16,7 @@
} }
}; };
// Precedence =========================================================== // Precedence ===========================================================
operators = [["left", '?'], ["nonassoc", 'UMINUS', 'UPLUS', 'NOT', '!', '!!', '~', '++', '--'], ["left", '*', '/', '%'], ["left", '+', '-'], ["left", '<<', '>>', '>>>'], ["left", '&', '|', '^'], ["left", '<=', '<', '>', '>='], ["right", 'DELETE', 'INSTANCEOF', 'TYPEOF'], ["right", '==', '!=', 'IS', 'ISNT'], ["left", '&&', '||', 'AND', 'OR'], ["right", '-=', '+=', '/=', '*=', '%=', '||=', '&&=', '?='], ["left", '.'], ["right", 'INDENT'], ["left", 'OUTDENT'], ["right", 'WHEN', 'LEADING_WHEN', 'IN', 'OF', 'BY'], ["right", 'THROW', 'FOR', 'NEW', 'SUPER'], ["left", 'EXTENDS'], ["right", 'ASSIGN', 'RETURN'], ["right", '->', '=>', 'UNLESS', 'IF', 'ELSE', 'WHILE']]; operators = [["left", '?'], ["nonassoc", 'UMINUS', 'UPLUS', 'NOT', '!', '!!', '~', '++', '--'], ["left", '*', '/', '%'], ["left", '+', '-'], ["left", '<<', '>>', '>>>'], ["left", '&', '|', '^'], ["left", '<=', '<', '>', '>='], ["right", 'DELETE', 'INSTANCEOF', 'TYPEOF'], ["right", '==', '!=', 'IS', 'ISNT'], ["left", '&&', '||', 'AND', 'OR'], ["right", '-=', '+=', '/=', '*=', '%=', '||=', '&&=', '?='], ["left", '.'], ["right", 'INDENT'], ["left", 'OUTDENT'], ["right", 'WHEN', 'LEADING_WHEN', 'IN', 'OF', 'BY', 'THROW'], ["right", 'FOR', 'NEW', 'SUPER'], ["left", 'EXTENDS'], ["right", 'ASSIGN', 'RETURN'], ["right", '->', '=>', 'UNLESS', 'IF', 'ELSE', 'WHILE']];
// Grammar ============================================================== // Grammar ==============================================================
grammar = { grammar = {
// All parsing will end in this rule, being the trunk of the AST. // All parsing will end in this rule, being the trunk of the AST.

2
lib/parser.js
View File

File diff suppressed because one or more lines are too long

4
src/grammar.coffee
View File

@@ -30,8 +30,8 @@ operators: [
["left", '.'] ["left", '.']
["right", 'INDENT'] ["right", 'INDENT']
["left", 'OUTDENT'] ["left", 'OUTDENT']
["right", 'WHEN', 'LEADING_WHEN', 'IN', 'OF', 'BY'] ["right", 'WHEN', 'LEADING_WHEN', 'IN', 'OF', 'BY', 'THROW']
["right", 'THROW', 'FOR', 'NEW', 'SUPER'] ["right", 'FOR', 'NEW', 'SUPER']
["left", 'EXTENDS'] ["left", 'EXTENDS']
["right", 'ASSIGN', 'RETURN'] ["right", 'ASSIGN', 'RETURN']
["right", '->', '=>', 'UNLESS', 'IF', 'ELSE', 'WHILE'] ["right", '->', '=>', 'UNLESS', 'IF', 'ELSE', 'WHILE']