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

Revert "Disallow parentheses in lvalue except as in computed keys or default values."

Browse Source 
This reverts commit 85087f2a0951f60ca035ca6d785e4bab6d96d8f7.
Fixes #193.
This commit is contained in:
Ingvar Stepanyan 2015-01-12 20:31:38 +02:00
parent bc2e01aa03
commit d1f95ece42
3 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
acorn.js
View File

@ -2002,18 +2002,14 @@
function parseMaybeAssign(noIn) {
var start = storeCurrentPos();
var oldParenL = metParenL;
var left = parseMaybeConditional(noIn);
if (tokType.isAssign) {
if (metParenL !== oldParenL) raise(tokStart, "Assigning to rvalue");
var node = startNodeAt(start);
node.operator = tokVal;
node.left = tokType === _eq ? toAssignable(left) : left;
checkLVal(left);
next();
node.right = parseMaybeAssign(noIn);
// restore count of '(' so they are allowed in lvalue's defaults
metParenL = oldParenL;
return finishNode(node, "AssignmentExpression");
}
return left;
@ -2341,10 +2337,7 @@
if (options.ecmaVersion >= 6) {
if (eat(_bracketL)) {
prop.computed = true;
// save & restore count of '(' so they are allowed in lvalue's computed props
var oldParenL = metParenL;
prop.key = parseExpression();
metParenL = oldParenL;
expect(_bracketR);
return;
} else {

20
test/tests-harmony.js
View File

@ -3940,7 +3940,7 @@ test("[a, b] = [b, a]", {
locations: true
});
test("({ responseText: text } = res)", {
test("({ responseText: text }) = res", {
type: "Program",
body: [{
type: "ExpressionStatement",
@ -3985,13 +3985,13 @@ test("({ responseText: text } = res)", {
type: "Identifier",
name: "res",
loc: {
start: {line: 1, column: 26},
end: {line: 1, column: 29}
start: {line: 1, column: 27},
end: {line: 1, column: 30}
}
},
loc: {
start: {line: 1, column: 1},
end: {line: 1, column: 29}
start: {line: 1, column: 0},
end: {line: 1, column: 30}
}
},
loc: {
@ -13826,11 +13826,9 @@ testFail("[v] += ary", "Assigning to rvalue (1:0)", {ecmaVersion: 6});
testFail("[2] = 42", "Assigning to rvalue (1:1)", {ecmaVersion: 6});
testFail("({ obj:20 }) = 42", "Assigning to rvalue (1:13)", {ecmaVersion: 6});
testFail("({ obj:20 }) = 42", "Assigning to rvalue (1:7)", {ecmaVersion: 6});
testFail("({ obj:20 } = 42)", "Assigning to rvalue (1:7)", {ecmaVersion: 6});
testFail("( { get x() {} } = 0 )", "Unexpected token (1:8)", {ecmaVersion: 6});
testFail("( { get x() {} } ) = 0", "Unexpected token (1:8)", {ecmaVersion: 6});
testFail("x \n is y", "Unexpected token (2:4)", {ecmaVersion: 6});
@ -13850,9 +13848,9 @@ testFail("let default", "Unexpected token (1:4)", {ecmaVersion: 6});
testFail("const default", "Unexpected token (1:6)", {ecmaVersion: 6});
testFail("\"use strict\"; ({ v: eval } = obj)", "Assigning to eval in strict mode (1:20)", {ecmaVersion: 6});
testFail("\"use strict\"; ({ v: eval }) = obj", "Assigning to eval in strict mode (1:20)", {ecmaVersion: 6});
testFail("\"use strict\"; ({ v: arguments } = obj)", "Assigning to arguments in strict mode (1:20)", {ecmaVersion: 6});
testFail("\"use strict\"; ({ v: arguments }) = obj", "Assigning to arguments in strict mode (1:20)", {ecmaVersion: 6});
testFail("for (let x = 42 in list) process(x);", "Unexpected token (1:16)", {ecmaVersion: 6});

4
test/tests.js
View File

@ -403,7 +403,7 @@ test("(1 + 2 ) * 3", {
preserveParens: true
});
testFail("(x) = 23", "Assigning to rvalue (1:4)");
testFail("(x) = 23", "Assigning to rvalue (1:0)", { preserveParens: true });
test("x = []", {
type: "Program",
@ -26883,7 +26883,7 @@ testFail("func() = 4",
"Assigning to rvalue (1:0)");
testFail("(1 + 1) = 10",
"Assigning to rvalue (1:8)");
"Assigning to rvalue (1:1)");
testFail("1++",
"Assigning to rvalue (1:0)");