kotovalexarian-likes-github
/
jashkenas--coffeescript
mirror of https://github.com/jashkenas/coffeescript.git
1
0
Fork 0
Code Releases Activity

slight simplification of the if-else grammar rules

This commit is contained in:
Jeremy Ashkenas 2010-06-27 11:46:30 -04:00
parent 800fb81d1b
commit 8eedfe4bc6
2 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/grammar.js
View File

@ -604,20 +604,16 @@
// The most basic form of *if* is a condition and an action. The following
// if-related rules are broken up along these lines in order to avoid
// ambiguity.
IfStart: [
IfBlock: [
o("IF Expression Block", function() {
return new IfNode($2, $3);
}), o("UNLESS Expression Block", function() {
return new IfNode($2, $3, {
invert: true
});
}), o("IfStart ELSE IF Expression Block", function() {
}), o("IfBlock ELSE IF Expression Block", function() {
return $1.addElse((new IfNode($4, $5)).forceStatement());
})
],
// An **IfStart** can optionally be followed by an else block.
IfBlock: [
o("IfStart"), o("IfStart ELSE Block", function() {
}), o("IfBlock ELSE Block", function() {
return $1.addElse($3);
})
],

11
src/grammar.coffee
View File

@ -481,16 +481,11 @@ grammar: {
# The most basic form of *if* is a condition and an action. The following
# if-related rules are broken up along these lines in order to avoid
# ambiguity.
IfStart: [
IfBlock: [
o "IF Expression Block", -> new IfNode $2, $3
o "UNLESS Expression Block", -> new IfNode $2, $3, {invert: true}
o "IfStart ELSE IF Expression Block", -> $1.addElse (new IfNode($4, $5)).forceStatement()
]
# An **IfStart** can optionally be followed by an else block.
IfBlock: [
o "IfStart"
o "IfStart ELSE Block", -> $1.addElse $3
o "IfBlock ELSE IF Expression Block", -> $1.addElse (new IfNode($4, $5)).forceStatement()
o "IfBlock ELSE Block", -> $1.addElse $3
]
# The full complement of *if* expressions, including postfix one-liner