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

removing AND OR NOT IS ISNT from the grammar

Browse Source
This commit is contained in:
Jeremy Ashkenas
2010-03-21 22:07:46 -04:00
parent 162f6b9d5c
commit f2ea18b0ba
3 changed files with 52 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/grammar.coffee
View File

@@ -465,7 +465,6 @@ grammar: {
o "!! Expression", -> new OpNode '!!', $2
o("- Expression", (-> new OpNode('-', $2)), {prec: 'UMINUS'})
o("+ Expression", (-> new OpNode('+', $2)), {prec: 'UPLUS'})
o "NOT Expression", -> new OpNode 'not', $2
o "~ Expression", -> new OpNode '~', $2
o "-- Expression", -> new OpNode '--', $2
o "++ Expression", -> new OpNode '++', $2
@@ -495,13 +494,9 @@ grammar: {
o "Expression == Expression", -> new OpNode '==', $1, $3
o "Expression != Expression", -> new OpNode '!=', $1, $3
o "Expression IS Expression", -> new OpNode 'is', $1, $3
o "Expression ISNT Expression", -> new OpNode 'isnt', $1, $3
o "Expression && Expression", -> new OpNode '&&', $1, $3
o "Expression || Expression", -> new OpNode '||', $1, $3
o "Expression AND Expression", -> new OpNode 'and', $1, $3
o "Expression OR Expression", -> new OpNode 'or', $1, $3
o "Expression ? Expression", -> new OpNode '?', $1, $3
o "Expression -= Expression", -> new OpNode '-=', $1, $3
@@ -532,15 +527,15 @@ grammar: {
# (2 + 3) * 4
operators: [
["left", '?']
["nonassoc", 'UMINUS', 'UPLUS', 'NOT', '!', '!!', '~', '++', '--']
["nonassoc", 'UMINUS', 'UPLUS', '!', '!!', '~', '++', '--']
["left", '*', '/', '%']
["left", '+', '-']
["left", '<<', '>>', '>>>']
["left", '&', '|', '^']
["left", '<=', '<', '>', '>=']
["right", 'DELETE', 'INSTANCEOF', 'TYPEOF']
["left", '==', '!=', 'IS', 'ISNT']
["left", '&&', '||', 'AND', 'OR']
["left", '==', '!=']
["left", '&&', '||']
["right", '-=', '+=', '/=', '*=', '%=', '||=', '&&=', '?=']
["left", '.']
["right", 'INDENT']