cerxes/babel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use simple loops always in array comprehensions, support yield inside of array comprehensions - closes #325, fixes #252

Browse Source
This commit is contained in:
Sebastian McKenzie
2015-01-02 02:14:36 +11:00
parent f1a178f8f9
commit ba67f57c1e
10 changed files with 83 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/6to5/transformation/templates/array-expression-comprehension-filter.js
View File

@@ -1,5 +0,0 @@
ARRAY.filter(function (KEY) {
return FILTER;
}).map(function (KEY) {
return STATEMENT;
});

3
lib/6to5/transformation/templates/array-expression-comprehension-map.js
View File

@@ -1,3 +0,0 @@
ARRAY.map(function (KEY) {
return STATEMENT;
});

44
lib/6to5/transformation/transformers/es7-array-comprehension.js
View File

@@ -1,43 +1,25 @@
var util = require("../../util");
var t = require("../../types");
var traverse = require("../../traverse");
var util = require("../../util");
var t = require("../../types");
exports.experimental = true;
var single = function (node, file) {
var block = node.blocks[0];
var templateName = "array-expression-comprehension-map";
if (node.filter) templateName = "array-expression-comprehension-filter";
var result = util.template(templateName, {
STATEMENT: node.body,
FILTER: node.filter,
ARRAY: file.toArray(block.right),
KEY: block.left
});
var aliasPossibles = [result.callee.object, result];
for (var i in aliasPossibles) {
var call = aliasPossibles[i];
if (t.isCallExpression(call)) {
call.arguments[0]._aliasFunction = true;
}
}
return result;
};
var multiple = function (node, file) {
var build = function (node, file) {
var uid = file.generateUidIdentifier("arr");
var container = util.template("array-comprehension-container", {
KEY: uid
});
container.callee.expression._aliasFunction = true;
container.callee._aliasFunction = true;
var block = container.callee.body;
var body = block.body;
if (traverse.hasType(node, "YieldExpression", t.FUNCTION_TYPES)) {
container.generator = true;
container = t.yieldExpression(container, true);
}
var returnStatement = body.pop();
body.push(exports._build(node, function () {
@@ -76,9 +58,5 @@ exports._build = function (node, buildBody) {
exports.ComprehensionExpression = function (node, parent, file) {
if (node.generator) return;
if (node.blocks.length === 1) {
return single(node, file);
} else {
return multiple(node, file);
}
return build(node, file);
};