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

Merge branch 'for_destructuring' of git://github.com/StanAngeloff/coffee-script

Browse Source
This commit is contained in:
Jeremy Ashkenas
2010-04-26 23:34:07 -04:00
parent e17567866a 76f9596f22
commit d62baf5a5d
6 changed files with 151 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/grammar.coffee
View File

@@ -433,12 +433,20 @@ grammar: {
o "FOR ForVariables ForSource Block", -> new ForNode $4, $3, $2[0], $2[1]
]
# An array of all accepted values for a variable inside the loop. This
# enables support for pattern matching.
ForValue: [
o "Identifier"
o "Array", -> new ValueNode $1
o "Object", -> new ValueNode $1
]
# An array or range comprehension has variables for the current element and
# (optional) reference to the current index. Or, *key, value*, in the case
# of object comprehensions.
ForVariables: [
o "Identifier", -> [$1]
o "Identifier , Identifier", -> [$1, $3]
o "ForValue", -> [$1]
o "ForValue , ForValue", -> [$1, $3]
]
# The source of a comprehension is an array or object with an optional filter