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

merging in master

Browse Source
This commit is contained in:
Jeremy Ashkenas
2009-12-28 20:06:23 -05:00
parent 7b5b261743 c84bb0c875
commit bb84a982ce
21 changed files with 295 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/coffee_script/grammar.y
View File

@@ -327,7 +327,9 @@ rule
# Looks a little confusing, check nodes.rb for the arguments to ForNode.
For:
Expression FOR
ForVariables ForSource { result = ForNode.new(val[0], val[3][0], val[2][0], val[3][1], val[2][1]) }
ForVariables ForSource "." { result = ForNode.new(val[0], val[3][0], val[2][0], val[3][1], val[2][1]) }
| FOR ForVariables ForSource
Terminator Expressions "." { result = ForNode.new(val[4], val[2][0], val[1][0], val[2][1], val[1][1]) }
;
# An array comprehension has variables for the current element and index.
@@ -338,9 +340,9 @@ rule
# The source of the array comprehension can optionally be filtered.
ForSource:
IN PureExpression "." { result = [val[1]] }
IN PureExpression { result = [val[1]] }
| IN PureExpression
IF Expression "." { result = [val[1], val[3]] }
IF Expression { result = [val[1], val[3]] }
;
# Switch/When blocks.