aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Lam S.L <alexlamsl@gmail.com>2017-06-23 04:14:30 +0800
committerGitHub <noreply@github.com>2017-06-23 04:14:30 +0800
commit0692435f01aad54fb586d24ad0c118d70b5c26ee (patch)
treee4008cd61682105c8d942564bee77a45c5cb311f
parentf67a6b0e434742df31144bf49d75ff61667520b6 (diff)
downloadtracifyjs-0692435f01aad54fb586d24ad0c118d70b5c26ee.tar.gz
tracifyjs-0692435f01aad54fb586d24ad0c118d70b5c26ee.zip
fix for-in loop parsing (#2144)
-rw-r--r--lib/parse.js8
-rw-r--r--test/input/invalid/for-in_1.js4
-rw-r--r--test/input/invalid/for-in_2.js4
-rw-r--r--test/mocha/cli.js30
4 files changed, 44 insertions, 2 deletions
diff --git a/lib/parse.js b/lib/parse.js
index 553568e1..e2dd04b6 100644
--- a/lib/parse.js
+++ b/lib/parse.js
@@ -1010,8 +1010,12 @@ function parse($TEXT, options) {
? (next(), var_(true))
: expression(true, true);
if (is("operator", "in")) {
- if (init instanceof AST_Var && init.definitions.length > 1)
- croak("Only one variable declaration allowed in for..in loop");
+ if (init instanceof AST_Var) {
+ if (init.definitions.length > 1)
+ croak("Only one variable declaration allowed in for..in loop", init.start.line, init.start.col, init.start.pos);
+ } else if (!is_assignable(init)) {
+ croak("Invalid left-hand side in for..in loop", init.start.line, init.start.col, init.start.pos);
+ }
next();
return for_in(init);
}
diff --git a/test/input/invalid/for-in_1.js b/test/input/invalid/for-in_1.js
new file mode 100644
index 00000000..4d872d19
--- /dev/null
+++ b/test/input/invalid/for-in_1.js
@@ -0,0 +1,4 @@
+var a, b = [1, 2];
+for (1, 2, a in b) {
+ console.log(a, b[a]);
+}
diff --git a/test/input/invalid/for-in_2.js b/test/input/invalid/for-in_2.js
new file mode 100644
index 00000000..57d861e9
--- /dev/null
+++ b/test/input/invalid/for-in_2.js
@@ -0,0 +1,4 @@
+var c = [1, 2];
+for (var a, b in c) {
+ console.log(a, c[a]);
+}
diff --git a/test/mocha/cli.js b/test/mocha/cli.js
index b54044eb..4c4943c6 100644
--- a/test/mocha/cli.js
+++ b/test/mocha/cli.js
@@ -518,6 +518,36 @@ describe("bin/uglifyjs", function () {
done();
});
});
+ it("Should throw syntax error (for-in init)", function(done) {
+ var command = uglifyjscmd + ' test/input/invalid/for-in_1.js';
+
+ exec(command, function (err, stdout, stderr) {
+ assert.ok(err);
+ assert.strictEqual(stdout, "");
+ assert.strictEqual(stderr.split(/\n/).slice(0, 4).join("\n"), [
+ "Parse error at test/input/invalid/for-in_1.js:2,5",
+ "for (1, 2, a in b) {",
+ " ^",
+ "ERROR: Invalid left-hand side in for..in loop"
+ ].join("\n"));
+ done();
+ });
+ });
+ it("Should throw syntax error (for-in var)", function(done) {
+ var command = uglifyjscmd + ' test/input/invalid/for-in_2.js';
+
+ exec(command, function (err, stdout, stderr) {
+ assert.ok(err);
+ assert.strictEqual(stdout, "");
+ assert.strictEqual(stderr.split(/\n/).slice(0, 4).join("\n"), [
+ "Parse error at test/input/invalid/for-in_2.js:2,5",
+ "for (var a, b in c) {",
+ " ^",
+ "ERROR: Only one variable declaration allowed in for..in loop"
+ ].join("\n"));
+ done();
+ });
+ });
it("Should handle literal string as source map input", function(done) {
var command = [
uglifyjscmd,