github/coffeescript
1
1
Fork 0
mirror of https://github.com/jashkenas/coffeescript.git synced 2026-01-14 17:27:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

dynakeys: can now be braceless

Browse Source
This commit is contained in:
satyr
2010-10-24 15:39:11 +09:00
parent 331036f86d
commit 85c8a6780a
3 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/rewriter.js
View File

@@ -138,7 +138,7 @@
});
};
exports.Rewriter.prototype.addImplicitBraces = function() {
var action, condition, stack;
var action, condition, stack, start;
stack = [];
condition = function(token, i) {
var _ref, _ref2, one, tag, three, two;
@@ -147,26 +147,27 @@
}
_ref = this.tokens.slice(i + 1, i + 4), one = _ref[0], two = _ref[1], three = _ref[2];
tag = token[0];
return (tag === 'TERMINATOR' || tag === 'OUTDENT') && !((two != null ? two[0] : undefined) === ':' || (one != null ? one[0] : undefined) === '@' && (three != null ? three[0] : undefined) === ':') || tag === ',' && ((_ref2 = one != null ? one[0] : undefined) !== 'IDENTIFIER' && _ref2 !== 'NUMBER' && _ref2 !== 'STRING' && _ref2 !== '@' && _ref2 !== 'TERMINATOR' && _ref2 !== 'OUTDENT');
return (tag === 'TERMINATOR' || tag === 'OUTDENT') && !((two != null ? two[0] : undefined) === ':' || (one != null ? one[0] : undefined) === '@' && (three != null ? three[0] : undefined) === ':' || (one != null ? one[0] : undefined) === '(') || tag === ',' && one && ((_ref2 = one[0]) !== 'IDENTIFIER' && _ref2 !== 'NUMBER' && _ref2 !== 'STRING' && _ref2 !== '@' && _ref2 !== 'TERMINATOR' && _ref2 !== 'OUTDENT' && _ref2 !== '(');
};
action = function(token, i) {
return this.tokens.splice(i, 0, ['}', '}', token[2]]);
};
start = null;
return this.scanTokens(function(token, i, tokens) {
var _ref, idx, tag, tok;
var _ref, _ref2, idx, tag, tok;
if (_ref = (tag = token[0]), __indexOf.call(EXPRESSION_START, _ref) >= 0) {
stack.push(tag === 'INDENT' && this.tag(i - 1) === '{' ? '{' : tag);
stack.push([(tag === 'INDENT' && this.tag(i - 1) === '{' ? '{' : tag), i]);
return 1;
}
if (__indexOf.call(EXPRESSION_END, tag) >= 0) {
stack.pop();
start = stack.pop();
return 1;
}
if (!(tag === ':' && stack[stack.length - 1] !== '{')) {
if (!(tag === ':' && ((_ref2 = stack[stack.length - 1]) != null ? _ref2[0] : undefined) !== '{')) {
return 1;
}
stack.push('{');
idx = this.tag(i - 2) === '@' ? i - 2 : i - 1;
stack.push(['{']);
idx = this.tag(i - 1) === ')' ? start[1] : this.tag(i - 2) === '@' ? i - 2 : i - 1;
if (this.tag(idx - 2) === 'HERECOMMENT') {
idx -= 2;
}

22
src/rewriter.coffee
View File

@@ -124,19 +124,27 @@ class exports.Rewriter
return false if 'HERECOMMENT' in [@tag(i + 1), @tag(i - 1)]
[one, two, three] = @tokens.slice i + 1, i + 4
[tag] = token
tag in ['TERMINATOR', 'OUTDENT'] and not (two?[0] is ':' or one?[0] is '@' and three?[0] is ':') or
tag is ',' and one?[0] not in ['IDENTIFIER', 'NUMBER', 'STRING', '@', 'TERMINATOR', 'OUTDENT']
tag in ['TERMINATOR', 'OUTDENT'] and
not (two?[0] is ':' or one?[0] is '@' and three?[0] is ':' or one?[0] is '(') or
tag is ',' and one and
one[0] not in ['IDENTIFIER', 'NUMBER', 'STRING', '@', 'TERMINATOR', 'OUTDENT', '(']
action = (token, i) -> @tokens.splice i, 0, ['}', '}', token[2]]
start = null
@scanTokens (token, i, tokens) ->
if (tag = token[0]) in EXPRESSION_START
stack.push if tag is 'INDENT' and @tag(i - 1) is '{' then '{' else tag
stack.push [(if tag is 'INDENT' and @tag(i - 1) is '{' then '{' else tag), i]
return 1
if tag in EXPRESSION_END
stack.pop()
start = stack.pop()
return 1
return 1 unless tag is ':' and stack[stack.length - 1] isnt '{'
stack.push '{'
idx = if @tag(i - 2) is '@' then i - 2 else i - 1
return 1 unless tag is ':' and stack[stack.length - 1]?[0] isnt '{'
stack.push ['{']
idx = if @tag(i - 1) is ')'
start[1]
else if @tag(i - 2) is '@'
i - 2
else
i - 1
idx -= 2 if @tag(idx - 2) is 'HERECOMMENT'
tok = ['{', '{', token[2]]
tok.generated = yes

3
test/test_literals.coffee
View File

@@ -245,6 +245,9 @@ eq obj.interpolatedkey, 123
eq obj[8], 8
eq obj[1], 1
eq 'braceless dynamic key',
(key for key of """braceless #{ 0 of ((0):(0)) and 'dynamic' } key""": 0)[0]
#542: Objects leading expression statement should be parenthesized.
{f: -> ok yes }.f() + 1