diff --git a/lib/grammar.js b/lib/grammar.js index 941bd625..3d0c26e4 100644 --- a/lib/grammar.js +++ b/lib/grammar.js @@ -596,7 +596,7 @@ }) ] }; - operators = [["left", 'CALL_START', 'CALL_END'], ["nonassoc", '++', '--'], ["left", '?'], ["right", 'UNARY'], ["left", 'MATH'], ["left", '+', '-'], ["left", 'SHIFT'], ["left", 'RELATION'], ["left", 'COMPARE'], ["left", 'LOGIC'], ["left", '.'], ["nonassoc", 'INDENT', 'OUTDENT'], ["right", 'WHEN', 'LEADING_WHEN', 'FORIN', 'FOROF', 'FROM', 'TO', 'BY', 'THROW'], ["right", 'IF', 'UNLESS', 'ELSE', 'FOR', 'WHILE', 'UNTIL', 'LOOP', 'SUPER', 'CLASS', 'EXTENDS'], ["right", '=', ':', 'COMPOUND_ASSIGN', 'RETURN'], ["right", '->', '=>', 'UNLESS', 'POST_IF', 'POST_UNLESS']]; + operators = [["left", 'CALL_START', 'CALL_END'], ["nonassoc", '++', '--'], ["left", '?'], ["right", 'UNARY'], ["left", 'MATH'], ["left", '+', '-'], ["left", 'SHIFT'], ["left", 'RELATION'], ["left", 'COMPARE'], ["left", 'LOGIC'], ["left", '.'], ["nonassoc", 'INDENT', 'OUTDENT'], ["right", 'WHEN', 'LEADING_WHEN', 'FORIN', 'FOROF', 'FROM', 'TO', 'BY', 'THROW'], ["right", 'IF', 'UNLESS', 'ELSE', 'FOR', 'WHILE', 'UNTIL', 'LOOP', 'SUPER', 'CLASS', 'EXTENDS'], ["right", '=', ':', 'COMPOUND_ASSIGN', 'RETURN'], ["right", '->', '=>', 'POST_IF', 'POST_UNLESS']]; tokens = []; for (name in grammar) { alternatives = grammar[name]; diff --git a/src/grammar.coffee b/src/grammar.coffee index aaac7aea..7ce74dd8 100644 --- a/src/grammar.coffee +++ b/src/grammar.coffee @@ -174,7 +174,7 @@ grammar = Existence: [ o "Expression ?", -> new Existence $1 ] - + Do: [ o "DO Code", -> $2.do() ] @@ -572,7 +572,7 @@ operators = [ ["right", 'WHEN', 'LEADING_WHEN', 'FORIN', 'FOROF', 'FROM', 'TO', 'BY', 'THROW'] ["right", 'IF', 'UNLESS', 'ELSE', 'FOR', 'WHILE', 'UNTIL', 'LOOP', 'SUPER', 'CLASS', 'EXTENDS'] ["right", '=', ':', 'COMPOUND_ASSIGN', 'RETURN'] - ["right", '->', '=>', 'UNLESS', 'POST_IF', 'POST_UNLESS'] + ["right", '->', '=>', 'POST_IF', 'POST_UNLESS'] ] # Wrapping Up