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

waypoint commit with both # and $ performing interpolation. Issue #544

Browse Source
This commit is contained in:
Jeremy Ashkenas
2010-07-26 23:08:09 -04:00
parent 9c8a22832c
commit d624310be1
12 changed files with 200 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/grammar.coffee
View File

@@ -32,8 +32,8 @@ unwrap = /function\s*\(\)\s*\{\s*return\s*([\s\S]*);\s*\}/
# previous nonterminal.
o = (patternString, action, options) ->
return [patternString, '$$ = $1;', options] unless action
action = if match = (action + '').match(unwrap) then match[1] else "($action())"
[patternString, "$$ = $action;", options]
action = if match = (action + '').match(unwrap) then match[1] else "(#action())"
[patternString, "$$ = #action;", options]
# Grammatical Rules
# -----------------
@@ -613,7 +613,7 @@ for name, alternatives of grammar
grammar[name] = for alt in alternatives
for token in alt[0].split ' '
tokens.push token unless grammar[token]
alt[1] = "return ${alt[1]}" if name is 'Root'
alt[1] = "return #{alt[1]}" if name is 'Root'
alt
# Initialize the **Parser** with our list of terminal **tokens**, our **grammar**