Merge remote-tracking branch 'upstream/master' into regexp

# Conflicts: # bin/run_test262.js
acornjs · Feb 13, 2018 · aaf6e9d · aaf6e9d
2 parents eb75208 + dfe1e9a
commit aaf6e9d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -28,10 +28,13 @@ The easiest way to install acorn is with [`npm`][npm].
 npm install acorn
 ```
 
-Alternately, download the source.
+Alternately, you can download the source and build acorn yourself:
 
 ```sh
 git clone https://github.com/acornjs/acorn.git
+cd acorn
+npm install
+npm run build
 ```
 
 ## Components

diff --git a/bin/run_test262.js b/bin/run_test262.js
@@ -8,6 +8,7 @@ const unsupportedFeatures = [
   "class-fields",
   "class-fields-private",
   "class-fields-public",
+  "numeric-separator-literal",
   "optional-catch-binding"
 ];
 

diff --git a/bin/test262.whitelist b/bin/test262.whitelist
@@ -212,18 +212,6 @@ language/module-code/early-export-global.js (default)
 language/module-code/early-export-global.js (strict mode)
 language/module-code/early-export-unresolvable.js (default)
 language/module-code/early-export-unresolvable.js (strict mode)
-language/module-code/instn-resolve-empty-export.js (default)
-language/module-code/instn-resolve-empty-export.js (strict mode)
-language/module-code/instn-resolve-empty-import.js (default)
-language/module-code/instn-resolve-empty-import.js (strict mode)
-language/module-code/instn-resolve-err-reference.js (default)
-language/module-code/instn-resolve-err-reference.js (strict mode)
-language/module-code/instn-resolve-err-syntax.js (default)
-language/module-code/instn-resolve-err-syntax.js (strict mode)
-language/module-code/instn-resolve-order-depth.js (default)
-language/module-code/instn-resolve-order-depth.js (strict mode)
-language/module-code/instn-resolve-order-src.js (default)
-language/module-code/instn-resolve-order-src.js (strict mode)
 language/module-code/parse-err-hoist-lex-fun.js (default)
 language/module-code/parse-err-hoist-lex-fun.js (strict mode)
 language/module-code/parse-err-hoist-lex-gen.js (default)

diff --git a/package.json b/package.json
@@ -49,8 +49,8 @@
     "eslint-plugin-standard": "^3.0.1",
     "rollup": "^0.45.0",
     "rollup-plugin-buble": "^0.16.0",
-    "test262-parser-runner": "^0.2.0",
-    "test262": "git+https://github.com/tc39/test262.git#51553973738063f457e248f7f1e643c561c8a64c",
+    "test262": "git+https://github.com/tc39/test262.git#18c1e799a01cc976695983b61e225ce7959bdd91",
+    "test262-parser-runner": "^0.3.1",
     "unicode-9.0.0": "^0.7.0"
   }
 }