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

Fixes #2367 -- super in for-loop

Browse source
This commit is contained in:
Marc Häfner 2013-11-15 06:35:04 +01:00
parent 544c99a9ad
commit 592aa33577
3 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/coffee-script/nodes.js
View file

@ -2747,7 +2747,7 @@
}; };
For.prototype.pluckDirectCall = function(o, body) { For.prototype.pluckDirectCall = function(o, body) {
var base, defs, expr, fn, idx, ref, val, _i, _len, _ref2, _ref3, _ref4, _ref5, _ref6, _ref7; var base, defs, expr, fn, idx, ref, val, _i, _len, _ref2, _ref3, _ref4, _ref5, _ref6, _ref7, _ref8;
defs = []; defs = [];
_ref2 = body.expressions; _ref2 = body.expressions;
for (idx = _i = 0, _len = _ref2.length; _i < _len; idx = ++_i) { for (idx = _i = 0, _len = _ref2.length; _i < _len; idx = ++_i) {
@ -2756,15 +2756,15 @@
if (!(expr instanceof Call)) { if (!(expr instanceof Call)) {
continue; continue;
} }
val = expr.variable.unwrapAll(); val = (_ref3 = expr.variable) != null ? _ref3.unwrapAll() : void 0;
if (!((val instanceof Code) || (val instanceof Value && ((_ref3 = val.base) != null ? _ref3.unwrapAll() : void 0) instanceof Code && val.properties.length === 1 && ((_ref4 = (_ref5 = val.properties[0].name) != null ? _ref5.value : void 0) === 'call' || _ref4 === 'apply')))) { if (!((val instanceof Code) || (val instanceof Value && ((_ref4 = val.base) != null ? _ref4.unwrapAll() : void 0) instanceof Code && val.properties.length === 1 && ((_ref5 = (_ref6 = val.properties[0].name) != null ? _ref6.value : void 0) === 'call' || _ref5 === 'apply')))) {
continue; continue;
} }
fn = ((_ref6 = val.base) != null ? _ref6.unwrapAll() : void 0) || val; fn = ((_ref7 = val.base) != null ? _ref7.unwrapAll() : void 0) || val;
ref = new Literal(o.scope.freeVariable('fn')); ref = new Literal(o.scope.freeVariable('fn'));
base = new Value(ref); base = new Value(ref);
if (val.base) { if (val.base) {
_ref7 = [base, val], val.base = _ref7[0], base = _ref7[1]; _ref8 = [base, val], val.base = _ref8[0], base = _ref8[1];
} }
body.expressions[idx] = new Call(base, expr.args); body.expressions[idx] = new Call(base, expr.args);
defs = defs.concat(this.makeCode(this.tab), new Assign(ref, fn).compileToFragments(o, LEVEL_TOP), this.makeCode(';\n')); defs = defs.concat(this.makeCode(this.tab), new Assign(ref, fn).compileToFragments(o, LEVEL_TOP), this.makeCode(';\n'));

2
src/nodes.coffee
View file

@ -1961,7 +1961,7 @@ exports.For = class For extends While
for expr, idx in body.expressions for expr, idx in body.expressions
expr = expr.unwrapAll() expr = expr.unwrapAll()
continue unless expr instanceof Call continue unless expr instanceof Call
val = expr.variable.unwrapAll() val = expr.variable?.unwrapAll()
continue unless (val instanceof Code) or continue unless (val instanceof Code) or
(val instanceof Value and (val instanceof Value and
val.base?.unwrapAll() instanceof Code and val.base?.unwrapAll() instanceof Code and

12
test/control_flow.coffee
View file

@ -442,3 +442,15 @@ test "#2555, strange function if bodies", ->
test "#1057: `catch` or `finally` in single-line functions", -> test "#1057: `catch` or `finally` in single-line functions", ->
ok do -> try throw 'up' catch then yes ok do -> try throw 'up' catch then yes
ok do -> try yes finally 'nothing' ok do -> try yes finally 'nothing'
test "#2367: super in for-loop", ->
class Foo
sum: 0
add: (val) -> @sum += val
class Bar extends Foo
add: (vals...) ->
super val for val in vals
@sum
eq 10, (new Bar).add 2, 3, 5