mirror of
https://github.com/jashkenas/coffeescript.git
synced 2022-11-09 12:23:24 -05:00
closes #1669; loop results are now collected in the same way as auto-returns are generated
This commit is contained in:
satyr
parent
2ea51b02cc
commit
ad1bc1e0b8
4 changed files with 95 additions and 96 deletions
|
|
@ -1,5 +1,5 @@
|
|||
(function() {
|
||||
var Access, Arr, Assign, Base, Block, Call, Class, Closure, Code, Comment, Existence, Extends, For, IDENTIFIER, IDENTIFIER_STR, IS_STRING, If, In, Index, LEVEL_ACCESS, LEVEL_COND, LEVEL_LIST, LEVEL_OP, LEVEL_PAREN, LEVEL_TOP, Literal, METHOD_DEF, NEGATE, NO, Obj, Op, Param, Parens, Push, RESERVED, Range, Return, SIMPLENUM, Scope, Slice, Splat, Switch, TAB, THIS, Throw, Try, UTILITIES, Value, While, YES, compact, del, ends, extend, flatten, last, merge, multident, starts, unfoldSoak, utility, _ref;
|
||||
var Access, Arr, Assign, Base, Block, Call, Class, Closure, Code, Comment, Existence, Extends, For, IDENTIFIER, IDENTIFIER_STR, IS_STRING, If, In, Index, LEVEL_ACCESS, LEVEL_COND, LEVEL_LIST, LEVEL_OP, LEVEL_PAREN, LEVEL_TOP, Literal, METHOD_DEF, NEGATE, NO, Obj, Op, Param, Parens, RESERVED, Range, Return, SIMPLENUM, Scope, Slice, Splat, Switch, TAB, THIS, Throw, Try, UTILITIES, Value, While, YES, compact, del, ends, extend, flatten, last, merge, multident, starts, unfoldSoak, utility, _ref;
|
||||
var __hasProp = Object.prototype.hasOwnProperty, __extends = function(child, parent) {
|
||||
for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; }
|
||||
function ctor() { this.constructor = child; }
|
||||
|
|
@ -74,8 +74,14 @@
|
|||
}
|
||||
return [src, tmp];
|
||||
};
|
||||
Base.prototype.makeReturn = function() {
|
||||
return new Return(this);
|
||||
Base.prototype.makeReturn = function(res) {
|
||||
var me;
|
||||
me = this.unwrapAll();
|
||||
if (res) {
|
||||
return new Call(new Literal("" + res + ".push"), [me]);
|
||||
} else {
|
||||
return new Return(me);
|
||||
}
|
||||
};
|
||||
Base.prototype.contains = function(pred) {
|
||||
var contains;
|
||||
|
|
@ -200,13 +206,13 @@
|
|||
if (exp.jumps(o)) return exp;
|
||||
}
|
||||
};
|
||||
Block.prototype.makeReturn = function() {
|
||||
Block.prototype.makeReturn = function(res) {
|
||||
var expr, len;
|
||||
len = this.expressions.length;
|
||||
while (len--) {
|
||||
expr = this.expressions[len];
|
||||
if (!(expr instanceof Comment)) {
|
||||
this.expressions[len] = expr.makeReturn();
|
||||
this.expressions[len] = expr.makeReturn(res);
|
||||
if (expr instanceof Return && !expr.expression) {
|
||||
this.expressions.splice(len, 1);
|
||||
}
|
||||
|
|
@ -310,7 +316,7 @@
|
|||
if (this.isStatement()) {
|
||||
return this;
|
||||
} else {
|
||||
return new Return(this);
|
||||
return Literal.__super__.makeReturn.apply(this, arguments);
|
||||
}
|
||||
};
|
||||
Literal.prototype.isAssignable = function() {
|
||||
|
|
@ -423,13 +429,6 @@
|
|||
Value.prototype.isSplice = function() {
|
||||
return last(this.properties) instanceof Slice;
|
||||
};
|
||||
Value.prototype.makeReturn = function() {
|
||||
if (this.properties.length) {
|
||||
return Value.__super__.makeReturn.call(this);
|
||||
} else {
|
||||
return this.base.makeReturn();
|
||||
}
|
||||
};
|
||||
Value.prototype.unwrap = function() {
|
||||
if (this.properties.length) {
|
||||
return this;
|
||||
|
|
@ -817,13 +816,7 @@
|
|||
Obj.prototype.compileNode = function(o) {
|
||||
var i, idt, indent, join, lastNoncom, node, obj, prop, props, _i, _len;
|
||||
props = this.properties;
|
||||
if (!props.length) {
|
||||
if (this.front) {
|
||||
return '({})';
|
||||
} else {
|
||||
return '{}';
|
||||
}
|
||||
}
|
||||
if (!props.length) return (this.front ? '({})' : '{}');
|
||||
if (this.generated) {
|
||||
for (_i = 0, _len = props.length; _i < _len; _i++) {
|
||||
node = props[_i];
|
||||
|
|
@ -1415,9 +1408,13 @@
|
|||
}
|
||||
While.prototype.children = ['condition', 'guard', 'body'];
|
||||
While.prototype.isStatement = YES;
|
||||
While.prototype.makeReturn = function() {
|
||||
this.returns = true;
|
||||
return this;
|
||||
While.prototype.makeReturn = function(res) {
|
||||
if (res) {
|
||||
return While.__super__.makeReturn.apply(this, arguments);
|
||||
} else {
|
||||
this.returns = true;
|
||||
return this;
|
||||
}
|
||||
};
|
||||
While.prototype.addBody = function(body) {
|
||||
this.body = body;
|
||||
|
|
@ -1443,10 +1440,9 @@
|
|||
if (body.isEmpty()) {
|
||||
body = '';
|
||||
} else {
|
||||
if (o.level > LEVEL_TOP || this.returns) {
|
||||
rvar = o.scope.freeVariable('results');
|
||||
if (this.returns) {
|
||||
body.makeReturn(rvar = o.scope.freeVariable('results'));
|
||||
set = "" + this.tab + rvar + " = [];\n";
|
||||
if (body) body = Push.wrap(rvar, body);
|
||||
}
|
||||
if (this.guard) {
|
||||
if (body.expressions.length > 1) {
|
||||
|
|
@ -1670,9 +1666,9 @@
|
|||
var _ref2;
|
||||
return this.attempt.jumps(o) || ((_ref2 = this.recovery) != null ? _ref2.jumps(o) : void 0);
|
||||
};
|
||||
Try.prototype.makeReturn = function() {
|
||||
if (this.attempt) this.attempt = this.attempt.makeReturn();
|
||||
if (this.recovery) this.recovery = this.recovery.makeReturn();
|
||||
Try.prototype.makeReturn = function(res) {
|
||||
if (this.attempt) this.attempt = this.attempt.makeReturn(res);
|
||||
if (this.recovery) this.recovery = this.recovery.makeReturn(res);
|
||||
return this;
|
||||
};
|
||||
Try.prototype.compileNode = function(o) {
|
||||
|
|
@ -1737,9 +1733,6 @@
|
|||
Parens.prototype.isComplex = function() {
|
||||
return this.body.isComplex();
|
||||
};
|
||||
Parens.prototype.makeReturn = function() {
|
||||
return this.body.makeReturn();
|
||||
};
|
||||
Parens.prototype.compileNode = function(o) {
|
||||
var bare, code, expr;
|
||||
expr = this.body.unwrap();
|
||||
|
|
@ -1758,7 +1751,7 @@
|
|||
return Parens;
|
||||
})();
|
||||
exports.For = For = (function() {
|
||||
__extends(For, Base);
|
||||
__extends(For, While);
|
||||
function For(body, source) {
|
||||
var _ref2;
|
||||
this.source = source.source, this.guard = source.guard, this.step = source.step, this.name = source.name, this.index = source.index;
|
||||
|
|
@ -1782,12 +1775,6 @@
|
|||
this.returns = false;
|
||||
}
|
||||
For.prototype.children = ['body', 'source', 'guard', 'step'];
|
||||
For.prototype.isStatement = YES;
|
||||
For.prototype.jumps = While.prototype.jumps;
|
||||
For.prototype.makeReturn = function() {
|
||||
this.returns = true;
|
||||
return this;
|
||||
};
|
||||
For.prototype.compileNode = function(o) {
|
||||
var body, defPart, forPart, forVarPart, guardPart, idt1, index, ivar, lastJumps, lvar, name, namePart, ref, resultPart, returnResult, rvar, scope, source, stepPart, stepvar, svar, varPart, _ref2;
|
||||
body = Block.wrap([this.body]);
|
||||
|
|
@ -1839,7 +1826,7 @@
|
|||
if (this.returns) {
|
||||
resultPart = "" + this.tab + rvar + " = [];\n";
|
||||
returnResult = "\n" + this.tab + "return " + rvar + ";";
|
||||
body = Push.wrap(rvar, body);
|
||||
body.makeReturn(rvar);
|
||||
}
|
||||
if (this.guard) {
|
||||
if (body.expressions.length > 1) {
|
||||
|
|
@ -1911,14 +1898,17 @@
|
|||
}
|
||||
return (_ref4 = this.otherwise) != null ? _ref4.jumps(o) : void 0;
|
||||
};
|
||||
Switch.prototype.makeReturn = function() {
|
||||
Switch.prototype.makeReturn = function(res) {
|
||||
var pair, _i, _len, _ref2, _ref3;
|
||||
_ref2 = this.cases;
|
||||
for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
|
||||
pair = _ref2[_i];
|
||||
pair[1].makeReturn();
|
||||
pair[1].makeReturn(res);
|
||||
}
|
||||
if ((_ref3 = this.otherwise) != null) _ref3.makeReturn();
|
||||
if (res) {
|
||||
this.otherwise || (this.otherwise = new Block([new Literal('void 0')]));
|
||||
}
|
||||
if ((_ref3 = this.otherwise) != null) _ref3.makeReturn(res);
|
||||
return this;
|
||||
};
|
||||
Switch.prototype.compileNode = function(o) {
|
||||
|
|
@ -1993,9 +1983,12 @@
|
|||
return this.compileExpression(o);
|
||||
}
|
||||
};
|
||||
If.prototype.makeReturn = function() {
|
||||
this.body && (this.body = new Block([this.body.makeReturn()]));
|
||||
this.elseBody && (this.elseBody = new Block([this.elseBody.makeReturn()]));
|
||||
If.prototype.makeReturn = function(res) {
|
||||
if (res) {
|
||||
this.elseBody || (this.elseBody = new Block([new Literal('void 0')]));
|
||||
}
|
||||
this.body && (this.body = new Block([this.body.makeReturn(res)]));
|
||||
this.elseBody && (this.elseBody = new Block([this.elseBody.makeReturn(res)]));
|
||||
return this;
|
||||
};
|
||||
If.prototype.ensureBlock = function(node) {
|
||||
|
|
@ -2044,12 +2037,6 @@
|
|||
};
|
||||
return If;
|
||||
})();
|
||||
Push = {
|
||||
wrap: function(name, exps) {
|
||||
if (exps.isEmpty() || last(exps.expressions).jumps()) return exps;
|
||||
return exps.push(new Call(new Value(new Literal(name), [new Access(new Literal('push'))]), [exps.pop()]));
|
||||
}
|
||||
};
|
||||
Closure = {
|
||||
wrap: function(expressions, statement, noReturn) {
|
||||
var args, call, func, mentionsArgs, meth;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue