github/coffeescript
1
1
Fork 0
mirror of https://github.com/jashkenas/coffeescript.git synced 2026-02-17 19:11:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

merged == and != into COMPARE

Browse Source
This commit is contained in:
satyr
2010-10-24 03:24:30 +09:00
parent fc332bcfbd
commit ebdcfb5227
5 changed files with 41 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/grammar.coffee
View File

@@ -518,8 +518,6 @@ grammar =
o 'Expression + Expression', -> new Op '+' , $1, $3
o 'Expression - Expression', -> new Op '-' , $1, $3
o 'Expression == Expression', -> new Op '==', $1, $3
o 'Expression != Expression', -> new Op '!=', $1, $3
o 'Expression MATH Expression', -> new Op $2, $1, $3
o 'Expression SHIFT Expression', -> new Op $2, $1, $3
@@ -556,7 +554,7 @@ operators = [
["left", '+', '-']
["left", 'SHIFT']
["left", 'RELATION']
["left", '==', '!=', 'COMPARE']
["left", 'COMPARE']
["left", 'LOGIC']
["left", '.']
["nonassoc", 'INDENT', 'OUTDENT']
@@ -586,7 +584,7 @@ for all name, alternatives of grammar
# precedence from low to high, and we have it high to low
# (as in [Yacc](http://dinosaur.compilertools.net/yacc/index.html)).
exports.parser = new Parser
tokens: tokens.join ' '
bnf: grammar
operators: operators.reverse()
startSymbol: 'Root'
tokens : tokens.join ' '
bnf : grammar
operators : operators.reverse()
startSymbol : 'Root'