(Partial) implementation of [Symbol.species]

src/org/mozilla/javascript/NativeArray.java

@@ -46,9 +46,10 @@ public class NativeArray extends IdScriptableObject implements List {
     private static final Object ARRAY_TAG = "Array";
     private static final Long NEGATIVE_ONE = Long.valueOf(-1);
 
-    static void init(Scriptable scope, boolean sealed) {
+    static void init(Context cx, Scriptable scope, boolean sealed) {
         NativeArray obj = new NativeArray(0);
-        obj.exportAsJSClass(MAX_PROTOTYPE_ID, scope, sealed);
+        IdFunctionObject constructor = obj.exportAsJSClass(MAX_PROTOTYPE_ID, scope, sealed);
+        ScriptRuntimeES6.addSymbolSpecies(cx, scope, constructor);
     }
 
     static int getMaximumInitialCapacity() {

src/org/mozilla/javascript/NativeMap.java

@@ -17,14 +17,16 @@ public class NativeMap extends IdScriptableObject {
 
     static void init(Context cx, Scriptable scope, boolean sealed) {
         NativeMap obj = new NativeMap();
-        obj.exportAsJSClass(MAX_PROTOTYPE_ID, scope, false);
+        IdFunctionObject constructor = obj.exportAsJSClass(MAX_PROTOTYPE_ID, scope, false);
 
         ScriptableObject desc = (ScriptableObject) cx.newObject(scope);
         desc.put("enumerable", desc, Boolean.FALSE);
         desc.put("configurable", desc, Boolean.TRUE);
         desc.put("get", desc, obj.get(NativeSet.GETSIZE, obj));
         obj.defineOwnProperty(cx, "size", desc);
 
+        ScriptRuntimeES6.addSymbolSpecies(cx, scope, constructor);
+
         if (sealed) {
             obj.sealObject();
         }

src/org/mozilla/javascript/NativePromise.java

@@ -48,19 +48,7 @@ public static void init(Context cx, Scriptable scope, boolean sealed) {
         constructor.defineConstructorMethod(
                 scope, "race", 1, NativePromise::race, DONTENUM, DONTENUM | READONLY);
 
-        ScriptableObject speciesDescriptor = (ScriptableObject) cx.newObject(scope);
-        ScriptableObject.putProperty(speciesDescriptor, "enumerable", false);
-        ScriptableObject.putProperty(speciesDescriptor, "configurable", true);
-        ScriptableObject.putProperty(
-                speciesDescriptor,
-                "get",
-                new LambdaFunction(
-                        scope,
-                        "get [Symbol.species]",
-                        0,
-                        (Context lcx, Scriptable lscope, Scriptable thisObj, Object[] args) ->
-                                constructor));
-        constructor.defineOwnProperty(cx, SymbolKey.SPECIES, speciesDescriptor, false);
+        ScriptRuntimeES6.addSymbolSpecies(cx, scope, constructor);
 
         constructor.definePrototypeMethod(
                 scope,

src/org/mozilla/javascript/NativeSet.java

@@ -19,14 +19,16 @@ public class NativeSet extends IdScriptableObject {
 
     static void init(Context cx, Scriptable scope, boolean sealed) {
         NativeSet obj = new NativeSet();
-        obj.exportAsJSClass(MAX_PROTOTYPE_ID, scope, false);
+        IdFunctionObject constructor = obj.exportAsJSClass(MAX_PROTOTYPE_ID, scope, false);
 
         ScriptableObject desc = (ScriptableObject) cx.newObject(scope);
         desc.put("enumerable", desc, Boolean.FALSE);
         desc.put("configurable", desc, Boolean.TRUE);
         desc.put("get", desc, obj.get(GETSIZE, obj));
         obj.defineOwnProperty(cx, "size", desc);
 
+        ScriptRuntimeES6.addSymbolSpecies(cx, scope, constructor);
+
         if (sealed) {
             obj.sealObject();
         }

src/org/mozilla/javascript/ScriptRuntime.java

@@ -163,7 +163,7 @@ public static ScriptableObject initSafeStandardObjects(
         NativeError.init(scope, sealed);
         NativeGlobal.init(cx, scope, sealed);
 
-        NativeArray.init(scope, sealed);
+        NativeArray.init(cx, scope, sealed);
         if (cx.getOptimizationLevel() > 0) {
             // When optimizing, attempt to fulfill all requests for new Array(N)
             // with a higher threshold before switching to a sparse

src/org/mozilla/javascript/ScriptRuntimeES6.java

@@ -18,4 +18,22 @@ public static Object requireObjectCoercible(
         }
         return val;
     }
+
+    /** Registers the symbol <code>[Symbol.species]</code> on the given constructor function. */
+    public static void addSymbolSpecies(
+            Context cx, Scriptable scope, IdScriptableObject constructor) {
+        ScriptableObject speciesDescriptor = (ScriptableObject) cx.newObject(scope);
+        ScriptableObject.putProperty(speciesDescriptor, "enumerable", false);
+        ScriptableObject.putProperty(speciesDescriptor, "configurable", true);
+        ScriptableObject.putProperty(
+                speciesDescriptor,
+                "get",
+                new LambdaFunction(
+                        scope,
+                        "get [Symbol.species]",
+                        0,
+                        (Context lcx, Scriptable lscope, Scriptable thisObj, Object[] args) ->
+                                thisObj));
+        constructor.defineOwnProperty(cx, SymbolKey.SPECIES, speciesDescriptor, false);
+    }
 }

src/org/mozilla/javascript/regexp/NativeRegExp.java

@@ -13,6 +13,7 @@
 import org.mozilla.javascript.Kit;
 import org.mozilla.javascript.NativeObject;
 import org.mozilla.javascript.ScriptRuntime;
+import org.mozilla.javascript.ScriptRuntimeES6;
 import org.mozilla.javascript.Scriptable;
 import org.mozilla.javascript.ScriptableObject;
 import org.mozilla.javascript.Symbol;
@@ -134,6 +135,8 @@ public static void init(Context cx, Scriptable scope, boolean sealed) {
         }
 
         defineProperty(scope, "RegExp", ctor, ScriptableObject.DONTENUM);
+
+        ScriptRuntimeES6.addSymbolSpecies(cx, scope, ctor);
     }
 
     NativeRegExp(Scriptable scope, RECompiled regexpCompiled) {

testsrc/jstests/es6/array.js

@@ -17,4 +17,9 @@ var a = Array.from(Array(2));
 assertTrue(0 in a);
 assertEquals(a.map(_ => 'a'), ['a', 'a']);
 
+(function TestSymbolSpecies() {
+	var symbolSpeciesValue = Array[Symbol.species];
+	assertEquals(Array, symbolSpeciesValue);
+})();
+
 "success";

testsrc/jstests/es6/map.js

@@ -130,4 +130,9 @@ function logElement(value, key, m) {
   }
 })();
 
+(function TestSymbolSpecies() {
+  var symbolSpeciesValue = Map[Symbol.species];
+  assertEquals(Map, symbolSpeciesValue);
+})();
+
 "success";

testsrc/jstests/es6/promises.js

@@ -998,6 +998,11 @@ function assertAsyncDone(iteration) {
   assertEquals(1, callCount);
 })();
 
-assertAsyncDone()
+assertAsyncDone();
+
+(function TestSymbolSpecies() {
+  var symbolSpeciesValue = Promise[Symbol.species];
+  assertEquals(Promise, symbolSpeciesValue);
+})();
 
 'success';

testsrc/jstests/es6/regexp.js

@@ -0,0 +1,8 @@
+load('testsrc/assert.js');
+
+(function TestSymbolSpecies() {
+  var symbolSpeciesValue = RegExp[Symbol.species];
+  assertEquals(RegExp, symbolSpeciesValue);
+})();
+
+'success';

testsrc/jstests/es6/set.js

@@ -88,4 +88,9 @@ function logElement(value, key) {
   assertEquals(1, mySet.size);
 })();
 
+(function TestSymbolSpecies() {
+  var symbolSpeciesValue = Set[Symbol.species];
+  assertEquals(Set, symbolSpeciesValue);
+})();
+
 "success";

testsrc/org/mozilla/javascript/tests/Test262SuiteTest.java

@@ -96,7 +96,6 @@ public class Test262SuiteTest {
                             "Reflect.set",
                             "Reflect.setPrototypeOf",
                             "SharedArrayBuffer",
-                            "Symbol.species",
                             "async-functions",
                             "async-iteration",
                             "class",

testsrc/org/mozilla/javascript/tests/es6/RegExpBasicTest.java

@@ -0,0 +1,14 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+package org.mozilla.javascript.tests.es6;
+
+import org.mozilla.javascript.Context;
+import org.mozilla.javascript.drivers.LanguageVersion;
+import org.mozilla.javascript.drivers.RhinoTest;
+import org.mozilla.javascript.drivers.ScriptTestsBase;
+
+@RhinoTest("testsrc/jstests/es6/regexp.js")
+@LanguageVersion(Context.VERSION_ES6)
+public class RegExpBasicTest extends ScriptTestsBase {}