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

Move comprehension support under ecmaVersion: 7 as per spec.

Browse Source
This commit is contained in:
Ingvar Stepanyan 2014-10-27 02:20:23 +02:00 committed by Marijn Haverbeke
parent 5ff7e59a0a
commit fd79ac5879
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
acorn.js
View File

@ -2024,7 +2024,7 @@
var tokStartLoc1 = tokStartLoc, tokStart1 = tokStart, val, exprList;
next();
// check whether this is generator comprehension or regular expression
if (options.ecmaVersion >= 6 && tokType === _for) {
if (options.ecmaVersion >= 7 && tokType === _for) {
val = parseComprehension(startNodeAt(start), true);
} else {
var oldParenL = ++metParenL;
@ -2061,7 +2061,7 @@
var node = startNode();
next();
// check whether this is array comprehension or regular array
if (options.ecmaVersion >= 6 && tokType === _for) {
if (options.ecmaVersion >= 7 && tokType === _for) {
return parseComprehension(node, false);
}
node.elements = parseExprList(_bracketR, true, true);

20
test/tests-harmony.js
View File

@ -3577,7 +3577,7 @@ test("[for (x of array) x]", {
end: {line: 1, column: 20}
}
}, {
ecmaVersion: 6,
ecmaVersion: 7,
ranges: true,
locations: true
});
@ -3699,7 +3699,7 @@ test("[for (x of array) for (y of array2) if (x === test) x]", {
end: {line: 1, column: 54}
}
}, {
ecmaVersion: 6,
ecmaVersion: 7,
ranges: true,
locations: true
});
@ -3821,7 +3821,7 @@ test("(for (x of array) for (y of array2) if (x === test) x)", {
end: {line: 1, column: 54}
}
}, {
ecmaVersion: 6,
ecmaVersion: 7,
ranges: true,
locations: true
});
@ -4025,7 +4025,7 @@ test("[for ([,x] of array) for ({[start.x]: x, [start.y]: y} of array2) x]", {
end: {line: 1, column: 68}
}
}, {
ecmaVersion: 6,
ecmaVersion: 7,
ranges: true,
locations: true
});
@ -15127,17 +15127,17 @@ testFail("`hello ${10;test`", "Unexpected token (1:11)", {ecmaVersion: 6});
testFail("function a() 1 // expression closure is not supported", "Unexpected token (1:13)", {ecmaVersion: 6});
testFail("[for (let x of []) x]", "Unexpected token (1:6)", {ecmaVersion: 6});
testFail("[for (let x of []) x]", "Unexpected token (1:6)", {ecmaVersion: 7});
testFail("[for (const x of []) x]", "Unexpected token (1:6)", {ecmaVersion: 6});
testFail("[for (const x of []) x]", "Unexpected token (1:6)", {ecmaVersion: 7});
testFail("[for (var x of []) x]", "Unexpected token (1:6)", {ecmaVersion: 6});
testFail("[for (var x of []) x]", "Unexpected token (1:6)", {ecmaVersion: 7});
testFail("[for (a in []) x] // (a,b) ", "Unexpected token (1:8)", {ecmaVersion: 6});
testFail("[for (a in []) x] // (a,b) ", "Unexpected token (1:8)", {ecmaVersion: 7});
testFail("var a = [if (x) x]", "Unexpected token (1:9)", {ecmaVersion: 6});
testFail("[for (x of [])] // no expression", "Unexpected token (1:14)", {ecmaVersion: 6});
testFail("[for (x of [])] // no expression", "Unexpected token (1:14)", {ecmaVersion: 7});
testFail("({ \"chance\" }) = obj", "Unexpected token (1:12)", {ecmaVersion: 6});
@ -15412,4 +15412,4 @@ test("(for (x of array) for (y of array2) if (x === test) x)", {
type: "ComprehensionExpression"
}
}]
}, {ecmaVersion: 6, preserveParens: true});
}, {ecmaVersion: 7, preserveParens: true});