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

New implementation of Rewriter#addImplicitIndentation, using Rewriter#detectEnd

Browse Source
This commit is contained in:
Jeremy Ashkenas
2010-08-10 22:05:01 -04:00
parent 45b5bae7d7
commit 87fd05afb0
2 changed files with 54 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
lib/rewriter.js
View File

@@ -45,11 +45,11 @@
levels = 0;
while (true) {
token = this.tokens[i];
if (levels === 0 && condition(token, i)) {
return action(token, i);
if (levels === 0 && condition.call(this, token, i)) {
return action.call(this, token, i);
}
if (!token || levels < 0) {
return action(token, i - 1);
return action.call(this, token, i - 1);
}
if (include(EXPRESSION_START, token[0])) {
levels += 1;
@@ -147,17 +147,17 @@
stack.push('{');
idx = before[0] === '@' ? i - 2 : i - 1;
this.tokens.splice(idx, 0, ['{', '{', token[2]]);
condition = __bind(function(token, i) {
condition = function(token, i) {
var _c, _d, _e, one, three, two;
_c = this.tokens.slice(i + 1, i + 4);
one = _c[0];
two = _c[1];
three = _c[2];
return ((('TERMINATOR' === (_d = token[0]) || 'OUTDENT' === _d)) && !((two && two[0] === ':') || (one && one[0] === '@' && three && three[0] === ':'))) || (token[0] === ',' && one && (!('IDENTIFIER' === (_e = one[0]) || 'STRING' === _e || '@' === _e || 'TERMINATOR' === _e || 'OUTDENT' === _e)));
}, this);
action = __bind(function(token, i) {
};
action = function(token, i) {
return this.tokens.splice(i, 0, ['}', '}', token[2]]);
}, this);
};
this.detectEnd(i + 2, condition, action);
return 2;
}
@@ -169,18 +169,18 @@
var _c, action, condition;
if (prev && prev.spaced && include(IMPLICIT_FUNC, prev[0]) && include(IMPLICIT_CALL, token[0]) && !(token[0] === '!' && (('IN' === (_c = post[0]) || 'OF' === _c)))) {
this.tokens.splice(i, 0, ['CALL_START', '(', token[2]]);
condition = __bind(function(token, i) {
condition = function(token, i) {
var _c, before;
_c = this.tokens.slice(i - 2, i + 1);
before = _c[0];
prev = _c[1];
return (!token.generated && this.tokens[i - 1][0] !== ',' && include(IMPLICIT_END, token[0]) && !(token[0] === 'INDENT' && (include(IMPLICIT_BLOCK, prev[0]) || before[0] === 'CLASS'))) || token[0] === 'PROPERTY_ACCESS' && prev[0] === 'OUTDENT';
}, this);
action = __bind(function(token, i) {
};
action = function(token, i) {
var idx;
idx = token[0] === 'OUTDENT' ? i + 1 : i;
return this.tokens.splice(idx, 0, ['CALL_END', ')', token[2]]);
}, this);
};
this.detectEnd(i + 1, condition, action);
return 2;
}
@@ -189,7 +189,7 @@
};
Rewriter.prototype.addImplicitIndentation = function() {
return this.scanTokens(__bind(function(prev, token, post, i) {
var _c, idx, indent, insertion, outdent, parens, pre, starter, tok;
var _c, action, condition, indent, outdent, starter;
if (token[0] === 'ELSE' && prev[0] !== 'OUTDENT') {
this.tokens.splice.apply(this.tokens, [i, 0].concat(this.indentation(token)));
return 2;
@@ -198,38 +198,28 @@
this.tokens.splice.apply(this.tokens, [i + 2, 0].concat(this.indentation(token)));
return 4;
}
if (!(include(SINGLE_LINERS, token[0]) && post[0] !== 'INDENT' && !(token[0] === 'ELSE' && post[0] === 'IF'))) {
return 1;
}
starter = token[0];
_c = this.indentation(token);
indent = _c[0];
outdent = _c[1];
indent.generated = (outdent.generated = true);
this.tokens.splice(i + 1, 0, indent);
idx = i + 1;
parens = 0;
while (true) {
idx += 1;
tok = this.tokens[idx];
pre = this.tokens[idx - 1];
if ((!tok || (include(SINGLE_CLOSERS, tok[0]) && tok[1] !== ';' && parens === 0) || (tok[0] === ')' && parens === 0)) && !(tok[0] === 'ELSE' && !('IF' === starter || 'THEN' === starter))) {
insertion = pre[0] === "," ? idx - 1 : idx;
this.tokens.splice(insertion, 0, outdent);
break;
}
if (tok[0] === '(') {
parens += 1;
}
if (tok[0] === ')') {
parens -= 1;
if (include(SINGLE_LINERS, token[0]) && post[0] !== 'INDENT' && !(token[0] === 'ELSE' && post[0] === 'IF')) {
starter = token[0];
_c = this.indentation(token);
indent = _c[0];
outdent = _c[1];
indent.generated = (outdent.generated = true);
this.tokens.splice(i + 1, 0, indent);
condition = function(token, i) {
return (include(SINGLE_CLOSERS, token[0]) && token[1] !== ';') && !(token[0] === 'ELSE' && !('IF' === starter || 'THEN' === starter));
};
action = function(token, i) {
var idx;
idx = this.tokens[i - 1][0] === ',' ? i - 1 : i;
return this.tokens.splice(idx, 0, outdent);
};
this.detectEnd(i + 2, condition, action);
if (token[0] === 'THEN') {
this.tokens.splice(i, 1);
}
return 2;
}
if (!(token[0] === 'THEN')) {
return 1;
}
this.tokens.splice(i, 1);
return 0;
return 1;
}, this));
};
Rewriter.prototype.ensureBalance = function(pairs) {

53
src/rewriter.coffee
View File

@@ -58,8 +58,8 @@ exports.Rewriter = class Rewriter
levels = 0
loop
token = @tokens[i]
return action token, i if levels is 0 and condition token, i
return action token, i - 1 if not token or levels < 0
return action.call this, token, i if levels is 0 and condition.call this, token, i
return action.call this, token, i - 1 if not token or levels < 0
levels += 1 if include EXPRESSION_START, token[0]
levels -= 1 if include EXPRESSION_END, token[0]
i += 1
@@ -135,11 +135,11 @@ exports.Rewriter = class Rewriter
stack.push '{'
idx = if before[0] is '@' then i - 2 else i - 1
@tokens.splice idx, 0, ['{', '{', token[2]]
condition = (token, i) =>
condition = (token, i) ->
[one, two, three] = @tokens.slice(i + 1, i + 4)
((token[0] in ['TERMINATOR', 'OUTDENT']) and not ((two and two[0] is ':') or (one and one[0] is '@' and three and three[0] is ':'))) or
(token[0] is ',' and one and (one[0] not in ['IDENTIFIER', 'STRING', '@', 'TERMINATOR', 'OUTDENT']))
action = (token, i) =>
action = (token, i) ->
@tokens.splice i, 0, ['}', '}', token[2]]
@detectEnd i + 2, condition, action
return 2
@@ -154,12 +154,12 @@ exports.Rewriter = class Rewriter
if prev and prev.spaced and include(IMPLICIT_FUNC, prev[0]) and include(IMPLICIT_CALL, token[0]) and
not (token[0] is '!' and (post[0] in ['IN', 'OF']))
@tokens.splice i, 0, ['CALL_START', '(', token[2]]
condition = (token, i) =>
condition = (token, i) ->
[before, prev] = @tokens.slice(i - 2, i + 1)
(not token.generated and @tokens[i - 1][0] isnt ',' and include(IMPLICIT_END, token[0]) and
not (token[0] is 'INDENT' and (include(IMPLICIT_BLOCK, prev[0]) or before[0] is 'CLASS'))) or
token[0] is 'PROPERTY_ACCESS' and prev[0] is 'OUTDENT'
action = (token, i) =>
action = (token, i) ->
idx = if token[0] is 'OUTDENT' then i + 1 else i
@tokens.splice idx, 0, ['CALL_END', ')', token[2]]
@detectEnd i + 1, condition, action
@@ -179,31 +179,22 @@ exports.Rewriter = class Rewriter
(@tokens[i + 2][0] is 'TERMINATOR' or @tokens[i + 2][0] is 'FINALLY')
@tokens.splice i + 2, 0, @indentation(token)...
return 4
return 1 unless include(SINGLE_LINERS, token[0]) and
post[0] isnt 'INDENT' and
not (token[0] is 'ELSE' and post[0] is 'IF')
starter = token[0]
[indent, outdent] = @indentation token
indent.generated = outdent.generated = true
@tokens.splice i + 1, 0, indent
idx = i + 1
parens = 0
loop
idx += 1
tok = @tokens[idx]
pre = @tokens[idx - 1]
if (not tok or
(include(SINGLE_CLOSERS, tok[0]) and tok[1] isnt ';' and parens is 0) or
(tok[0] is ')' and parens is 0)) and
not (tok[0] is 'ELSE' and starter not in ['IF', 'THEN'])
insertion = if pre[0] is "," then idx - 1 else idx
@tokens.splice insertion, 0, outdent
break
parens += 1 if tok[0] is '('
parens -= 1 if tok[0] is ')'
return 1 unless token[0] is 'THEN'
@tokens.splice i, 1
return 0
if include(SINGLE_LINERS, token[0]) and post[0] isnt 'INDENT' and
not (token[0] is 'ELSE' and post[0] is 'IF')
starter = token[0]
[indent, outdent] = @indentation token
indent.generated = outdent.generated = true
@tokens.splice i + 1, 0, indent
condition = (token, i) ->
(include(SINGLE_CLOSERS, token[0]) and token[1] isnt ';') and
not (token[0] is 'ELSE' and starter not in ['IF', 'THEN'])
action = (token, i) ->
idx = if @tokens[i - 1][0] is ',' then i - 1 else i
@tokens.splice idx, 0, outdent
@detectEnd i + 2, condition, action
@tokens.splice i, 1 if token[0] is 'THEN'
return 2
return 1
# Ensure that all listed pairs of tokens are correctly balanced throughout
# the course of the token stream.