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

adding when clauses with multiple values

Browse Source
This commit is contained in:
Jeremy Ashkenas
2010-01-13 19:56:35 -05:00
parent abd9ab5c71
commit 0ceca0778c
3 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/coffee_script/grammar.y
View File

@@ -314,6 +314,12 @@ rule
| ArgList OUTDENT { result = val[0] }
;
# Just simple, comma-separated, required arguments (no fancy syntax).
SimpleArgs:
Expression { result = val[0] }
| SimpleArgs "," Expression { result = ([val[0]] << val[2]).flatten }
;
# Try/catch/finally exception handling blocks.
Try:
TRY Block Catch { result = TryNode.new(val[1], val[2][0], val[2][1]) }
@@ -383,8 +389,8 @@ rule
# An individual when.
When:
LEADING_WHEN Expression Block { result = IfNode.new(val[1], val[2], nil, {:statement => true}) }
| LEADING_WHEN Expression Block
LEADING_WHEN SimpleArgs Block { result = IfNode.new(val[1], val[2], nil, {:statement => true}) }
| LEADING_WHEN SimpleArgs Block
Terminator { result = IfNode.new(val[1], val[2], nil, {:statement => true}) }
| Comment Terminator When { result = val[2].add_comment(val[0]) }
;