github/coffeescript
1
1
Fork 0
mirror of https://github.com/jashkenas/coffeescript.git synced 2026-04-11 03:00:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

allowing quoted strings within object assignment, a in JS and JSON

Browse Source
This commit is contained in:
Jeremy Ashkenas
2009-12-24 17:14:53 -08:00
parent 65e9ba4c30
commit 95bfb0b45c
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/coffee_script/grammar.y
View File

@@ -121,6 +121,7 @@ rule
# Assignment within an object literal. # Assignment within an object literal.
AssignObj: AssignObj:
IDENTIFIER ":" Expression { result = AssignNode.new(val[0], val[2], :object) } IDENTIFIER ":" Expression { result = AssignNode.new(val[0], val[2], :object) }
| STRING ":" Expression { result = AssignNode.new(val[0], val[2], :object) }
| Comment { result = val[0] } | Comment { result = val[0] }
; ;

2
test/fixtures/execution/test_everything.cs vendored
View File

@@ -6,7 +6,7 @@ func: =>
a--. a--.
c: { c: {
text: b "text": b
} }
c: 'error' unless 42 > 41 c: 'error' unless 42 > 41

2
test/fixtures/execution/test_everything.js vendored
View File

@@ -7,7 +7,7 @@
a--; a--;
} }
var c = { var c = {
text: b "text": b
}; };
if (!(42 > 41)) { if (!(42 > 41)) {
c = 'error'; c = 'error';