general improvements around AST_ForIn (#2796)
- compress using `collapse_vars` - remove unused `name` - simplify `loop_body`
This commit is contained in:
@@ -267,11 +267,10 @@ var AST_For = DEFNODE("For", "init condition step", {
|
||||
}
|
||||
}, AST_IterationStatement);
|
||||
|
||||
var AST_ForIn = DEFNODE("ForIn", "init name object", {
|
||||
var AST_ForIn = DEFNODE("ForIn", "init object", {
|
||||
$documentation: "A `for ... in` statement",
|
||||
$propdoc: {
|
||||
init: "[AST_Node] the `for/in` initialization code",
|
||||
name: "[AST_SymbolRef?] the loop variable, only if `init` is AST_Var",
|
||||
object: "[AST_Node] the object that we're looping through"
|
||||
},
|
||||
_walk: function(visitor) {
|
||||
|
||||
@@ -847,9 +847,8 @@ merge(Compressor.prototype, {
|
||||
};
|
||||
|
||||
function loop_body(x) {
|
||||
if (x instanceof AST_Switch) return x;
|
||||
if (x instanceof AST_For || x instanceof AST_ForIn || x instanceof AST_DWLoop) {
|
||||
return (x.body instanceof AST_BlockStatement ? x.body : x);
|
||||
if (x instanceof AST_IterationStatement) {
|
||||
return x.body instanceof AST_BlockStatement ? x.body : x;
|
||||
}
|
||||
return x;
|
||||
};
|
||||
@@ -1193,6 +1192,11 @@ merge(Compressor.prototype, {
|
||||
if (!(expr.body instanceof AST_Block)) {
|
||||
extract_candidates(expr.body);
|
||||
}
|
||||
} else if (expr instanceof AST_ForIn) {
|
||||
extract_candidates(expr.object);
|
||||
if (!(expr.body instanceof AST_Block)) {
|
||||
extract_candidates(expr.body);
|
||||
}
|
||||
} else if (expr instanceof AST_If) {
|
||||
extract_candidates(expr.condition);
|
||||
if (!(expr.body instanceof AST_Block)) {
|
||||
|
||||
@@ -1054,12 +1054,10 @@ function parse($TEXT, options) {
|
||||
};
|
||||
|
||||
function for_in(init) {
|
||||
var lhs = init instanceof AST_Var ? init.definitions[0].name : null;
|
||||
var obj = expression(true);
|
||||
expect(")");
|
||||
return new AST_ForIn({
|
||||
init : init,
|
||||
name : lhs,
|
||||
object : obj,
|
||||
body : in_loop(statement)
|
||||
});
|
||||
|
||||
@@ -4062,3 +4062,30 @@ cascade_statement: {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
cascade_forin: {
|
||||
options = {
|
||||
collapse_vars: true,
|
||||
}
|
||||
input: {
|
||||
var a;
|
||||
function f(b) {
|
||||
return [ b, b, b ];
|
||||
}
|
||||
for (var c in a = console, f(a))
|
||||
console.log(c);
|
||||
}
|
||||
expect: {
|
||||
var a;
|
||||
function f(b) {
|
||||
return [ b, b, b ];
|
||||
}
|
||||
for (var c in f(a = console))
|
||||
console.log(c);
|
||||
}
|
||||
expect_stdout: [
|
||||
"0",
|
||||
"1",
|
||||
"2",
|
||||
]
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user