Issue #1302 - Add self-hosted implementation for string regex .matchAll

This resolves #1302.

1 files changed, 23 insertions, 56 deletions

diff --git a/js/src/vm/GlobalObject.cpp b/js/src/vm/GlobalObject.cpp
index 85707e1c6..013208f66 100644
--- a/js/src/vm/GlobalObject.cpp
+++ b/js/src/vm/GlobalObject.cpp
@@ -468,62 +468,29 @@ GlobalObject::initSelfHostingBuiltins(JSContext* cx, Handle<GlobalObject*> globa
         return false;
     }
 
-    RootedValue std_isConcatSpreadable(cx);
-    std_isConcatSpreadable.setSymbol(cx->wellKnownSymbols().get(JS::SymbolCode::isConcatSpreadable));
-    if (!JS_DefineProperty(cx, global, "std_isConcatSpreadable", std_isConcatSpreadable,
-                           JSPROP_PERMANENT | JSPROP_READONLY))
-    {
-        return false;
-    }
-
-    // Define a top-level property 'std_iterator' with the name of the method
-    // used by for-of loops to create an iterator.
-    RootedValue std_iterator(cx);
-    std_iterator.setSymbol(cx->wellKnownSymbols().get(JS::SymbolCode::iterator));
-    if (!JS_DefineProperty(cx, global, "std_iterator", std_iterator,
-                           JSPROP_PERMANENT | JSPROP_READONLY))
-    {
-        return false;
-    }
-
-    RootedValue std_match(cx);
-    std_match.setSymbol(cx->wellKnownSymbols().get(JS::SymbolCode::match));
-    if (!JS_DefineProperty(cx, global, "std_match", std_match,
-                           JSPROP_PERMANENT | JSPROP_READONLY))
-    {
-        return false;
-    }
-
-    RootedValue std_replace(cx);
-    std_replace.setSymbol(cx->wellKnownSymbols().get(JS::SymbolCode::replace));
-    if (!JS_DefineProperty(cx, global, "std_replace", std_replace,
-                           JSPROP_PERMANENT | JSPROP_READONLY))
-    {
-        return false;
-    }
-
-    RootedValue std_search(cx);
-    std_search.setSymbol(cx->wellKnownSymbols().get(JS::SymbolCode::search));
-    if (!JS_DefineProperty(cx, global, "std_search", std_search,
-                           JSPROP_PERMANENT | JSPROP_READONLY))
-    {
-        return false;
-    }
-
-    RootedValue std_species(cx);
-    std_species.setSymbol(cx->wellKnownSymbols().get(JS::SymbolCode::species));
-    if (!JS_DefineProperty(cx, global, "std_species", std_species,
-                           JSPROP_PERMANENT | JSPROP_READONLY))
-    {
-        return false;
-    }
-
-    RootedValue std_split(cx);
-    std_split.setSymbol(cx->wellKnownSymbols().get(JS::SymbolCode::split));
-    if (!JS_DefineProperty(cx, global, "std_split", std_split,
-                           JSPROP_PERMANENT | JSPROP_READONLY))
-    {
-        return false;
+    struct SymbolAndName {
+        JS::SymbolCode code;
+        const char* name;
+    };
+
+    SymbolAndName wellKnownSymbols[] = {
+        {JS::SymbolCode::isConcatSpreadable, "std_isConcatSpreadable"},
+        {JS::SymbolCode::iterator, "std_iterator"},
+        {JS::SymbolCode::match, "std_match"},
+        {JS::SymbolCode::matchAll, "std_matchAll"},
+        {JS::SymbolCode::replace, "std_replace"},
+        {JS::SymbolCode::search, "std_search"},
+        {JS::SymbolCode::species, "std_species"},
+        {JS::SymbolCode::split, "std_split"},
+    };
+
+    RootedValue symVal(cx);
+    for (const auto& sym : wellKnownSymbols) {
+        symVal.setSymbol(cx->wellKnownSymbols().get(sym.code));
+        if (!JS_DefineProperty(cx, global, sym.name, symVal,
+                               JSPROP_PERMANENT | JSPROP_READONLY)) {
+            return false;
+        }
     }
 
     return InitBareBuiltinCtor(cx, global, JSProto_Array) &&