Merge branch 'master' into harmony-v2.8.21

2017-04-02 17:24:45 +08:00
parent 2f93058c6e b7f6b73f4e
commit 4614b5b46e
25 changed files with 1388 additions and 680 deletions
--- a/lib/parse.js
+++ b/lib/parse.js
@@ -845,14 +845,14 @@ var ATOMIC_START_TOKEN = array_to_hash([ "atom", "num", "string", "regexp", "nam
 function parse($TEXT, options) {

    options = defaults(options, {
-        strict         : false,
-        filename       : null,
-        toplevel       : null,
-        expression     : false,
-        html5_comments : true,
        bare_returns   : false,
-        shebang        : true,
        cli            : false,
+        expression     : false,
+        filename       : null,
+        html5_comments : true,
+        shebang        : true,
+        strict         : false,
+        toplevel       : null,
    });

    var S = {