kotovalexarian-likes-github/jashkenas--coffeescript
1
0
Fork 0
mirror of https://github.com/jashkenas/coffeescript.git synced 2022-11-09 12:23:24 -05:00
Code Releases Activity

rewriter: (a): (b): (c) is now allowed

Browse source
This commit is contained in:
satyr 2010-10-26 00:56:03 +09:00
parent ff82c59903
commit 863f3f6b47
3 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/rewriter.js
View file

@ -153,7 +153,7 @@
return this.tokens.splice(i, 0, ['}', '}', token[2]]); return this.tokens.splice(i, 0, ['}', '}', token[2]]);
}; };
return this.scanTokens(function(token, i, tokens) { return this.scanTokens(function(token, i, tokens) {
var _ref, _ref2, ago2, idx, tag, tok; var _ref, _ref2, ago1, ago2, idx, tag, tok;
if (_ref = (tag = token[0]), __indexOf.call(EXPRESSION_START, _ref) >= 0) { if (_ref = (tag = token[0]), __indexOf.call(EXPRESSION_START, _ref) >= 0) {
stack.push([(tag === 'INDENT' && this.tag(i - 1) === '{' ? '{' : tag), i]); stack.push([(tag === 'INDENT' && this.tag(i - 1) === '{' ? '{' : tag), i]);
return 1; return 1;
@ -162,15 +162,11 @@
start = stack.pop(); start = stack.pop();
return 1; return 1;
} }
if (tag !== ':') { if (!(tag === ':' && ((ago2 = this.tag(i - 2)) === ':' || (ago1 = this.tag(i - 1)) === ')' && this.tag(start[1] - 1) === ':' || ((_ref2 = stack[stack.length - 1]) != null ? _ref2[0] : undefined) !== '{'))) {
return 1;
}
ago2 = this.tag(i - 2);
if (!(ago2 === ':' || ((_ref2 = stack[stack.length - 1]) != null ? _ref2[0] : undefined) !== '{')) {
return 1; return 1;
} }
stack.push(['{']); stack.push(['{']);
idx = ago2 === '@' ? i - 2 : this.tag(i - 1) === ')' ? start[1] : i - 1; idx = ago1 === ')' ? start[1] : ago2 === '@' ? i - 2 : i - 1;
if (this.tag(idx - 2) === 'HERECOMMENT') { if (this.tag(idx - 2) === 'HERECOMMENT') {
idx -= 2; idx -= 2;
} }

13
src/rewriter.coffee
View file

@ -134,14 +134,15 @@ class exports.Rewriter
if tag in EXPRESSION_END if tag in EXPRESSION_END
start = stack.pop() start = stack.pop()
return 1 return 1
return 1 unless tag is ':' return 1 unless tag is ':' and
ago2 = @tag i - 2 ((ago2 = @tag i - 2) is ':' or
return 1 unless ago2 is ':' or stack[stack.length - 1]?[0] isnt '{' (ago1 = @tag i - 1) is ')' and @tag(start[1] - 1) is ':' or
stack[stack.length - 1]?[0] isnt '{')
stack.push ['{'] stack.push ['{']
idx = if ago2 is '@' idx = if ago1 is ')'
i - 2
else if @tag(i - 1) is ')'
start[1] start[1]
else if ago2 is '@'
i - 2
else else
i - 1 i - 1
idx -= 2 if @tag(idx - 2) is 'HERECOMMENT' idx -= 2 if @tag(idx - 2) is 'HERECOMMENT'

4
test/test_literals.coffee
View file

@ -232,13 +232,13 @@ eq result.two, obj.list()[1]
i = 0 i = 0
obj = { obj = {
### leading comment ### ### leading comment ###
"interpolated#{'key'}": 123
(4 * 2): 8 (4 * 2): 8
### cached shorthand ### ### cached shorthand ###
(++i) (++i)
"#{'interpolated'}": """#{"key"}""": 123
### traling comment ### ### traling comment ###
} }
eq obj.interpolatedkey, 123 eq obj.interpolated.key, 123
eq obj[8], 8 eq obj[8], 8
eq obj[1], 1 eq obj[1], 1