Preserve original execution order in :: operator.

This commit is contained in:
Ingvar Stepanyan
2015-05-14 12:39:05 +03:00
parent 1a299b2bcc
commit fd8e94a90f
5 changed files with 60 additions and 24 deletions

View File

@@ -7,28 +7,35 @@ export var metadata = {
stage: 0
};
function inferBindContext(bindExpr, scope) {
// nothing to infer
if (bindExpr.object) return bindExpr.object;
function getTempId(scope) {
var id = scope.path.getData("functionBind");
if (!id) {
id = scope.generateTemp("context");
scope.path.setData("functionBind", id);
if (id) return id;
id = scope.generateTemp("context");
return scope.path.setData("functionBind", id);
}
function inferBindContext(bind, scope) {
var tempId = getTempId(scope);
if (!bind.object) {
bind.callee.object = t.assignmentExpression("=", tempId, bind.callee.object);
} else {
bind.callee = t.sequenceExpression([
t.assignmentExpression("=", tempId, bind.object),
bind.callee
]);
}
bindExpr.callee.object = t.assignmentExpression("=", id, bindExpr.callee.object);
return id;
return tempId;
}
export function CallExpression(node, parent, scope, file) {
var bindExpr = node.callee;
if (!t.isBindExpression(bindExpr)) return;
var bindCtx = inferBindContext(bindExpr, scope);
node.callee = t.memberExpression(bindExpr.callee, t.identifier("call"));
node.arguments.unshift(bindCtx);
var bind = node.callee;
if (!t.isBindExpression(bind)) return;
var context = inferBindContext(bind, scope);
node.callee = t.memberExpression(bind.callee, t.identifier("call"));
node.arguments.unshift(context);
}
export function BindExpression(node, parent, scope, file) {
var bindCtx = inferBindContext(node, scope);
return t.callExpression(t.memberExpression(node.callee, t.identifier("bind")), [bindCtx]);
var context = inferBindContext(node, scope);
return t.callExpression(t.memberExpression(node.callee, t.identifier("bind")), [context]);
}

View File

@@ -2,5 +2,5 @@
var _context;
var f = ns.obj.func.bind(ctx);
var g = (_context = ns.obj).func.bind(_context);
var f = (_context = ctx, ns.obj.func).bind(_context);
var g = (_context = ns.obj).func.bind(_context);

View File

@@ -2,7 +2,7 @@
var _context;
ns.obj.func.call(ctx);
(_context = ctx, ns.obj.func).call(_context);
(_context = ns.obj).func.call(_context);
ns.obj1.func.call(ns.obj2);
(_context = ns.obj2, ns.obj1.func).call(_context);

View File

@@ -0,0 +1,27 @@
var operations = [];
var lib = {};
for (let key of ['f', 'g', 'h']) {
let func = () => operations.push(`lib.${key}()`);
Object.defineProperty(lib, key, {
get() {
operations.push(`get lib.${key}`);
return func;
}
});
}
({prop:'value'})
::lib.f()
::lib.g()
::lib.h();
assert.deepEqual(operations, [
'get lib.f',
'lib.f()',
'get lib.g',
'lib.g()',
'get lib.h',
'lib.h()'
]);

View File

@@ -1,11 +1,13 @@
"use strict";
var _context;
var _iterlib = require("iterlib");
_iterlib.forEach.call(_iterlib.takeWhile.call(_iterlib.map.call(getPlayers(), function (x) {
(_context = (_context = (_context = getPlayers(), _iterlib.map).call(_context, function (x) {
return x.character();
}), function (x) {
}), _iterlib.takeWhile).call(_context, function (x) {
return x.strength > 100;
}), function (x) {
}), _iterlib.forEach).call(_context, function (x) {
return console.log(x);
});
});