Merge branch 'master' into harmony-2.8.0

2017-02-27 04:37:48 +08:00
parent 07734b000a 0b0296eb2a
commit 88a338f29e
63 changed files with 4471 additions and 480 deletions
--- a/test/mocha/directives.js
+++ b/test/mocha/directives.js
@@ -178,7 +178,7 @@ describe("Directives", function() {
                throw new Error("Expected parser to fail");
            } catch (e) {
                assert.strictEqual(e instanceof uglify.JS_Parse_Error, true);
-                assert.strictEqual(e.message, "SyntaxError: Unexpected token: punc (])");
+                assert.strictEqual(e.message, "Unexpected token: punc (])");
            }

            test_directive(tokenizer, tests[i]);