Convert NativeGenerator to descriptor.

Author: aardvark179

rhino/src/main/java/org/mozilla/javascript/NativeGenerator.java

@@ -6,6 +6,9 @@
 
 package org.mozilla.javascript;
 
+import static org.mozilla.javascript.ClassDescriptor.Destination.CTOR;
+import static org.mozilla.javascript.Symbol.Kind.REGULAR;
+
 import java.io.Serial;
 
 /**
@@ -14,34 +17,27 @@
  *
  * @author Norris Boyd
  */
-public final class NativeGenerator extends IdScriptableObject {
+public final class NativeGenerator extends ScriptableObject {
     @Serial private static final long serialVersionUID = -1383456283657974338L;
 
-    private static final Object GENERATOR_TAG = "Generator";
-
-    static NativeGenerator init(TopLevel scope, boolean sealed) {
-        // Generator
-        // Can't use "NativeGenerator().exportAsJSClass" since we don't want
-        // to define "Generator" as a constructor in the top-level scope.
-
-        NativeGenerator prototype = new NativeGenerator();
-        if (scope != null) {
-            prototype.setParentScope(scope);
-            prototype.setPrototype(getObjectPrototype(scope));
-        }
-        prototype.activatePrototypeMap(MAX_PROTOTYPE_ID);
-        if (sealed) {
-            prototype.sealObject();
-        }
-
-        // Need to access Generator prototype when constructing
-        // Generator instances, but don't have a generator constructor
-        // to use to find the prototype. Use the "associateValue"
-        // approach instead.
-        if (scope != null) {
-            scope.associateValue(GENERATOR_TAG, prototype);
-        }
+    private static final SymbolKey GENERATOR_TAG = new SymbolKey("GeneratorPrototype", REGULAR);
+    private static final ClassDescriptor DESCRIPTOR;
+
+    static {
+        DESCRIPTOR =
+                new ClassDescriptor.Builder(GENERATOR_TAG)
+                        .withMethod(CTOR, "close", 1, NativeGenerator::js_close)
+                        .withMethod(CTOR, "next", 1, NativeGenerator::js_next)
+                        .withMethod(CTOR, "send", 0, NativeGenerator::js_send)
+                        .withMethod(CTOR, "throw", 0, NativeGenerator::js_throw)
+                        .withMethod(CTOR, "__iterator__", 1, NativeGenerator::js_iterator)
+                        .build();
+    }
 
+    static NativeGenerator init(Context cx, TopLevel scope, boolean sealed) {
+        var prototype = new NativeGenerator();
+        DESCRIPTOR.populateGlobal(cx, scope, prototype, sealed);
+        scope.associateValue(GENERATOR_TAG, prototype);
         return prototype;
     }
 
@@ -68,78 +64,49 @@ public String getClassName() {
         return "Generator";
     }
 
-    @Override
-    protected void initPrototypeId(int id) {
-        String s;
-        int arity;
-        switch (id) {
-            case Id_close:
-                arity = 1;
-                s = "close";
-                break;
-            case Id_next:
-                arity = 1;
-                s = "next";
-                break;
-            case Id_send:
-                arity = 0;
-                s = "send";
-                break;
-            case Id_throw:
-                arity = 0;
-                s = "throw";
-                break;
-            case Id___iterator__:
-                arity = 1;
-                s = "__iterator__";
-                break;
-            default:
-                throw new IllegalArgumentException(String.valueOf(id));
-        }
-        initPrototypeMethod(GENERATOR_TAG, id, s, arity);
+    private static Object js_close(
+            Context cx, JSFunction f, Object nt, VarScope s, Object thisObj, Object[] args) {
+        // need to run any pending finally clauses
+        var generator = realThis(thisObj);
+        return generator.resume(cx, s, GENERATOR_CLOSE, new GeneratorClosedException());
     }
 
-    @Override
-    public Object execIdCall(
-            IdFunctionObject f, Context cx, VarScope scope, Scriptable thisObj, Object[] args) {
-        if (!f.hasTag(GENERATOR_TAG)) {
-            return super.execIdCall(f, cx, scope, thisObj, args);
-        }
-        int id = f.methodId();
-
-        NativeGenerator generator = ensureType(thisObj, NativeGenerator.class, f);
-
-        switch (id) {
-            case Id_close:
-                // need to run any pending finally clauses
-                return generator.resume(cx, scope, GENERATOR_CLOSE, new GeneratorClosedException());
-
-            case Id_next:
-                // arguments to next() are ignored
-                generator.firstTime = false;
-                return generator.resume(cx, scope, GENERATOR_SEND, Undefined.instance);
-
-            case Id_send:
-                {
-                    Object arg = args.length > 0 ? args[0] : Undefined.instance;
-                    if (generator.firstTime && !arg.equals(Undefined.instance)) {
-                        throw ScriptRuntime.typeErrorById("msg.send.newborn");
-                    }
-                    return generator.resume(cx, scope, GENERATOR_SEND, arg);
-                }
-
-            case Id_throw:
-                return generator.resume(
-                        cx, scope, GENERATOR_THROW, args.length > 0 ? args[0] : Undefined.instance);
-
-            case Id___iterator__:
-                return thisObj;
-
-            default:
-                throw new IllegalArgumentException(String.valueOf(id));
+    private static Object js_next(
+            Context cx, JSFunction f, Object nt, VarScope s, Object thisObj, Object[] args) {
+        // arguments to next() are ignored
+        var generator = realThis(thisObj);
+        generator.firstTime = false;
+        return generator.resume(cx, s, GENERATOR_SEND, Undefined.instance);
+    }
+
+    private static Object js_send(
+            Context cx, JSFunction f, Object nt, VarScope s, Object thisObj, Object[] args) {
+        {
+            var generator = realThis(thisObj);
+            Object arg = args.length > 0 ? args[0] : Undefined.instance;
+            if (generator.firstTime && !arg.equals(Undefined.instance)) {
+                throw ScriptRuntime.typeErrorById("msg.send.newborn");
+            }
+            return generator.resume(cx, s, GENERATOR_SEND, arg);
         }
     }
 
+    private static Object js_throw(
+            Context cx, JSFunction f, Object nt, VarScope s, Object thisObj, Object[] args) {
+        var generator = realThis(thisObj);
+        return generator.resume(
+                cx, s, GENERATOR_THROW, args.length > 0 ? args[0] : Undefined.instance);
+    }
+
+    private static Object js_iterator(
+            Context cx, JSFunction f, Object nt, VarScope s, Object thisObj, Object[] args) {
+        return thisObj;
+    }
+
+    private static NativeGenerator realThis(Object thisObj) {
+        return LambdaConstructor.convertThisObject(thisObj, NativeGenerator.class);
+    }
+
     private Object resume(Context cx, VarScope scope, int operation, Object value) {
         if (savedState == null) {
             if (operation == GENERATOR_CLOSE) return Undefined.instance;
@@ -178,39 +145,6 @@ private Object resume(Context cx, VarScope scope, int operation, Object value) {
         }
     }
 
-    @Override
-    protected int findPrototypeId(String s) {
-        int id;
-        switch (s) {
-            case "close":
-                id = Id_close;
-                break;
-            case "next":
-                id = Id_next;
-                break;
-            case "send":
-                id = Id_send;
-                break;
-            case "throw":
-                id = Id_throw;
-                break;
-            case "__iterator__":
-                id = Id___iterator__;
-                break;
-            default:
-                id = 0;
-                break;
-        }
-        return id;
-    }
-
-    private static final int Id_close = 1,
-            Id_next = 2,
-            Id_send = 3,
-            Id_throw = 4,
-            Id___iterator__ = 5,
-            MAX_PROTOTYPE_ID = 5;
-
     private JSFunction function;
     private Object savedState;
     private String lineSource;

rhino/src/main/java/org/mozilla/javascript/NativeIterator.java

@@ -53,7 +53,7 @@ static void init(Context cx, TopLevel scope, boolean sealed) {
         if (cx.getLanguageVersion() >= Context.VERSION_ES6) {
             ES6Generator.init(scope, sealed);
         } else {
-            NativeGenerator.init(scope, sealed);
+            NativeGenerator.init(cx, scope, sealed);
         }
 
         // StopIteration