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

Merge branch 'master' into newline-splat

Browse Source 
Conflicts:
	lib/lexer.js
	lib/parser.js
	src/lexer.coffee
This commit is contained in:
Sam Stephenson
2010-10-11 12:12:13 -05:00
parent 20a07c174c d7052d09ff
commit 967fec2ae5
22 changed files with 451 additions and 910 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/grammar.coffee
View File

@@ -130,9 +130,7 @@ grammar =
o "AlphaNumeric"
o "JS", -> new Literal $1
o "REGEX", -> new Literal $1
o "TRUE", -> new Literal true
o "FALSE", -> new Literal false
o "NULL", -> new Literal 'null'
o "BOOL", -> new Literal $1
]
# Assignment of a variable, property, or index to a value.
@@ -195,7 +193,7 @@ grammar =
ParamList: [
o "", -> []
o "Param", -> [$1]
o "ParamList , Param", -> $1.concat [$3]
o "ParamList , Param", -> $1.concat $3
]
# A single parameter in a function definition can be ordinary, or a splat
@@ -265,8 +263,8 @@ grammar =
AssignList: [
o "", -> []
o "AssignObj", -> [$1]
o "AssignList , AssignObj", -> $1.concat [$3]
o "AssignList OptComma TERMINATOR AssignObj", -> $1.concat [$4]
o "AssignList , AssignObj", -> $1.concat $3
o "AssignList OptComma TERMINATOR AssignObj", -> $1.concat $4
o "AssignList OptComma INDENT AssignList OptComma OUTDENT", -> $1.concat $4
]
@@ -363,8 +361,8 @@ grammar =
# (i.e. comma-separated expressions). Newlines work as well.
ArgList: [
o "Arg", -> [$1]
o "ArgList , Arg", -> $1.concat [$3]
o "ArgList OptComma TERMINATOR Arg", -> $1.concat [$4]
o "ArgList , Arg", -> $1.concat $3
o "ArgList OptComma TERMINATOR Arg", -> $1.concat $4
o "INDENT ArgList OptComma OUTDENT", -> $2
o "ArgList OptComma INDENT ArgList OptComma OUTDENT", -> $1.concat $4
]
@@ -380,8 +378,7 @@ grammar =
# having the newlines wouldn't make sense.
SimpleArgs: [
o "Expression"
o "SimpleArgs , Expression", ->
if $1 instanceof Array then $1.concat([$3]) else [$1].concat([$3])
o "SimpleArgs , Expression", -> [].concat $1, $3
]
# The variants of *try/catch/finally* exception handling blocks.
@@ -527,8 +524,8 @@ grammar =
# rules are necessary.
Operation: [
o "UNARY Expression", -> new Op $1, $2
o("- Expression", (-> new Op('-', $2)), {prec: 'UNARY'})
o("+ Expression", (-> new Op('+', $2)), {prec: 'UNARY'})
o "- Expression", (-> new Op '-', $2), prec: 'UNARY'
o "+ Expression", (-> new Op '+', $2), prec: 'UNARY'
o "-- Expression", -> new Op '--', $2
o "++ Expression", -> new Op '++', $2