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

Revert "one more bit to pass -- futzing with the if/else chains" 

This reverts commit 066ee52615.
This commit is contained in:
Jeremy Ashkenas 2010-02-13 00:11:14 -05:00
parent 066ee52615
commit 094c2682bd
7 changed files with 27 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/coffee_script/grammar.js
View File

@ -485,12 +485,8 @@
// The most basic form of "if".
IfBlock: [o("IF Expression Block", function() {
return new IfNode($2, $3);
})
],
IfChain: [o("IfBlock", function() {
return $1;
}), o("IfBlock ElsIfs", function() {
return $1.add_else($2);
}), o("IF Expression Block ElsIfs", function() {
return (new IfNode($2, $3)).add_else($4);
})
],
ElsIf: [o("ELSEIF Expression Block", function() {
@ -505,9 +501,9 @@
})
],
// The full complement of if blocks, including postfix one-liner ifs and unlesses.
If: [o("IfChain", function() {
If: [o("IfBlock", function() {
return $1;
}), o("IfChain ELSE Block", function() {
}), o("IfBlock ELSE Block", function() {
return $1.add_else($3);
}), o("Expression IF Expression", function() {
return new IfNode($3, Expressions.wrap([$1]), null, {

2
lib/coffee_script/lexer.js
View File

@ -117,7 +117,7 @@
this.tag(1, 'PROPERTY_ACCESS');
}
}
tag === 'IF' && this.tag() === 'ELSE' ? this.tag(1, 'ELSIF') : this.token(tag, id);
tag === 'ELSE' && this.tag() === 'IF' ? this.tag(1, 'ELSIF') : this.token(tag, id);
this.i += id.length;
return true;
};

24
lib/coffee_script/parser.js
View File

File diff suppressed because one or more lines are too long

6
lib/coffee_script/rewriter.js
View File

@ -26,7 +26,7 @@
return __d;
}).call(this);
// Tokens that indicate the close of a clause of an expression.
EXPRESSION_CLOSE = ['CATCH', 'WHEN', 'ELSE', 'ELSIF', 'FINALLY'].concat(EXPRESSION_TAIL);
EXPRESSION_CLOSE = ['CATCH', 'WHEN', 'ELSE', 'FINALLY'].concat(EXPRESSION_TAIL);
// Tokens pairs that, in immediate succession, indicate an implicit call.
IMPLICIT_FUNC = ['IDENTIFIER', 'SUPER', ')', 'CALL_END', ']', 'INDEX_END'];
IMPLICIT_END = ['IF', 'UNLESS', 'FOR', 'WHILE', 'TERMINATOR', 'OUTDENT'];
@ -43,7 +43,7 @@
// Single-line flavors of block expressions that have unclosed endings.
// The grammar can't disambiguate them, so we insert the implicit indentation.
SINGLE_LINERS = ['ELSE', "->", "=>", 'TRY', 'FINALLY', 'THEN'];
SINGLE_CLOSERS = ['TERMINATOR', 'CATCH', 'FINALLY', 'ELSE', 'ELSIF', 'OUTDENT', 'LEADING_WHEN', 'PARAM_START'];
SINGLE_CLOSERS = ['TERMINATOR', 'CATCH', 'FINALLY', 'ELSE', 'OUTDENT', 'LEADING_WHEN', 'PARAM_START'];
// Rewrite the token stream in multiple passes, one logical filter at
// a time. This could certainly be changed into a single pass through the
// stream, with a big ol' efficient switch, but it's much nicer like this.
@ -229,7 +229,7 @@
return this.scan_tokens((function(__this) {
var __func = function(prev, token, post, i) {
var idx, insertion, parens, starter, tok;
if (!(SINGLE_LINERS.indexOf(token[0]) >= 0 && post[0] !== 'INDENT')) {
if (!(SINGLE_LINERS.indexOf(token[0]) >= 0 && post[0] !== 'INDENT' && !(token[0] === 'ELSE' && post[0] === 'IF'))) {
return 1;
}
starter = token[0];

10
src/grammar.coffee
View File

@ -412,11 +412,7 @@ grammar: {
# The most basic form of "if".
IfBlock: [
o "IF Expression Block", -> new IfNode($2, $3)
]
IfChain: [
o "IfBlock", -> $1
o "IfBlock ElsIfs", -> $1.add_else($2)
o "IF Expression Block ElsIfs", -> (new IfNode($2, $3)).add_else($4)
]
ElsIf: [
@ -431,8 +427,8 @@ grammar: {
# The full complement of if blocks, including postfix one-liner ifs and unlesses.
If: [
o "IfChain", -> $1
o "IfChain ELSE Block", -> $1.add_else($3)
o "IfBlock", -> $1
o "IfBlock ELSE Block", -> $1.add_else($3)
o "Expression IF Expression", -> new IfNode($3, Expressions.wrap([$1]), null, {statement: true})
o "Expression UNLESS Expression", -> new IfNode($3, Expressions.wrap([$1]), null, {statement: true, invert: true})
]

2
src/lexer.coffee
View File

@ -105,7 +105,7 @@ lex::identifier_token: ->
@tokens.splice(-2, 1)
else
@tag(1, 'PROPERTY_ACCESS')
if tag is 'IF' and @tag() is 'ELSE'
if tag is 'ELSE' and @tag() is 'IF'
@tag(1, 'ELSIF')
else
@token(tag, id)

7
src/rewriter.coffee
View File

@ -14,7 +14,7 @@ EXPRESSION_START: pair[0] for pair in BALANCED_PAIRS
EXPRESSION_TAIL: pair[1] for pair in BALANCED_PAIRS
# Tokens that indicate the close of a clause of an expression.
EXPRESSION_CLOSE: ['CATCH', 'WHEN', 'ELSE', 'ELSIF', 'FINALLY'].concat(EXPRESSION_TAIL)
EXPRESSION_CLOSE: ['CATCH', 'WHEN', 'ELSE', 'FINALLY'].concat(EXPRESSION_TAIL)
# Tokens pairs that, in immediate succession, indicate an implicit call.
IMPLICIT_FUNC: ['IDENTIFIER', 'SUPER', ')', 'CALL_END', ']', 'INDEX_END']
@ -33,7 +33,7 @@ for pair in BALANCED_PAIRS
# Single-line flavors of block expressions that have unclosed endings.
# The grammar can't disambiguate them, so we insert the implicit indentation.
SINGLE_LINERS: ['ELSE', "->", "=>", 'TRY', 'FINALLY', 'THEN']
SINGLE_CLOSERS: ['TERMINATOR', 'CATCH', 'FINALLY', 'ELSE', 'ELSIF', 'OUTDENT', 'LEADING_WHEN', 'PARAM_START']
SINGLE_CLOSERS: ['TERMINATOR', 'CATCH', 'FINALLY', 'ELSE', 'OUTDENT', 'LEADING_WHEN', 'PARAM_START']
# Rewrite the token stream in multiple passes, one logical filter at
# a time. This could certainly be changed into a single pass through the
@ -160,7 +160,8 @@ re::add_implicit_parentheses: ->
# ')' can close a single-line block, but we need to make sure it's balanced.
re::add_implicit_indentation: ->
this.scan_tokens (prev, token, post, i) =>
return 1 unless SINGLE_LINERS.indexOf(token[0]) >= 0 and post[0] isnt 'INDENT'
return 1 unless SINGLE_LINERS.indexOf(token[0]) >= 0 and post[0] isnt 'INDENT' and
not (token[0] is 'ELSE' and post[0] is 'IF')
starter: token[0]
this.tokens.splice(i + 1, 0, ['INDENT', 2, token[2]])
idx: i + 1