refactoring - remove RuntimeDataProvider class

Author: fglock

src/main/java/org/perlonjava/codegen/EmitLiteral.java

@@ -136,7 +136,7 @@ public static void emitHashLiteral(EmitterVisitor emitterVisitor, HashLiteralNod
         mv.visitMethodInsn(Opcodes.INVOKESTATIC,
                 "org/perlonjava/runtime/RuntimeHash",
                 "createHashRef",
-                "(Lorg/perlonjava/runtime/RuntimeDataProvider;)Lorg/perlonjava/runtime/RuntimeScalar;", false);
+                "(Lorg/perlonjava/runtime/RuntimeBase;)Lorg/perlonjava/runtime/RuntimeScalar;", false);
 
         emitterVisitor.ctx.logDebug("visit(HashLiteralNode) end");
     }

src/main/java/org/perlonjava/codegen/EmitOperator.java

@@ -182,7 +182,7 @@ static void handleAtan2(EmitterVisitor emitterVisitor, OperatorNode node) {
     // Handles the 'die' built-in function, which throws an exception.
     static void handleDieBuiltin(EmitterVisitor emitterVisitor, OperatorNode node) {
         // Handle:  die LIST
-        //   static RuntimeDataProvider die(RuntimeDataProvider value, int ctx)
+        //   static RuntimeBase die(RuntimeBase value, int ctx)
         emitterVisitor.ctx.logDebug("handleDieBuiltin " + node);
         // Accept the operand in LIST context.
         node.operand.accept(emitterVisitor.with(RuntimeContextType.LIST));
@@ -196,7 +196,7 @@ static void handleDieBuiltin(EmitterVisitor emitterVisitor, OperatorNode node) {
     // Handles the 'reverse' built-in function, which reverses a list.
     static void handleReverseBuiltin(EmitterVisitor emitterVisitor, OperatorNode node) {
         // Handle:  reverse LIST
-        //   static RuntimeDataProvider reverse(RuntimeDataProvider value, int ctx)
+        //   static RuntimeBase reverse(RuntimeBase value, int ctx)
         emitterVisitor.ctx.logDebug("handleReverseBuiltin " + node);
         // Accept the operand in LIST context.
         node.operand.accept(emitterVisitor.with(RuntimeContextType.LIST));
@@ -322,7 +322,7 @@ static void handleRepeat(EmitterVisitor emitterVisitor, BinaryOperatorNode node)
         // Invoke the static method for the 'repeat' operator.
         emitterVisitor.ctx.mv.visitMethodInsn(Opcodes.INVOKESTATIC, "org/perlonjava/operators/Operator",
                 "repeat",
-                "(Lorg/perlonjava/runtime/RuntimeDataProvider;Lorg/perlonjava/runtime/RuntimeScalar;I)Lorg/perlonjava/runtime/RuntimeBase;", false);
+                "(Lorg/perlonjava/runtime/RuntimeBase;Lorg/perlonjava/runtime/RuntimeScalar;I)Lorg/perlonjava/runtime/RuntimeBase;", false);
 
         if (emitterVisitor.ctx.contextType == RuntimeContextType.SCALAR) {
             emitterVisitor.ctx.mv.visitTypeInsn(Opcodes.CHECKCAST, "org/perlonjava/runtime/RuntimeScalar");

src/main/java/org/perlonjava/codegen/EmitSubroutine.java

@@ -154,7 +154,7 @@ static void handleApplyOperator(EmitterVisitor emitterVisitor, BinaryOperatorNod
                 Opcodes.INVOKESTATIC,
                 "org/perlonjava/runtime/RuntimeCode",
                 "apply",
-                "(Lorg/perlonjava/runtime/RuntimeScalar;Ljava/lang/String;Lorg/perlonjava/runtime/RuntimeDataProvider;I)Lorg/perlonjava/runtime/RuntimeList;",
+                "(Lorg/perlonjava/runtime/RuntimeScalar;Ljava/lang/String;Lorg/perlonjava/runtime/RuntimeBase;I)Lorg/perlonjava/runtime/RuntimeList;",
                 false); // Generate an .apply() call
         if (emitterVisitor.ctx.contextType == RuntimeContextType.SCALAR) {
             // Transform the value in the stack to RuntimeScalar

src/main/java/org/perlonjava/operators/Operator.java

@@ -22,7 +22,7 @@ public static RuntimeScalar xor(RuntimeScalar left, RuntimeScalar right) {
         return getScalarBoolean(left.getBoolean() ^ right.getBoolean());
     }
 
-    public static RuntimeScalar join(RuntimeScalar runtimeScalar, RuntimeDataProvider list) {
+    public static RuntimeScalar join(RuntimeScalar runtimeScalar, RuntimeBase list) {
         String delimiter = runtimeScalar.toString();
         // Join the list into a string
         StringBuilder sb = new StringBuilder();
@@ -689,15 +689,15 @@ public static RuntimeList splice(RuntimeArray runtimeArray, RuntimeList list) {
 
         int offset;
         if (!list.isEmpty()) {
-            RuntimeDataProvider value = list.elements.removeFirst();
+            RuntimeBase value = list.elements.removeFirst();
             offset = value.scalar().getInt();
         } else {
             offset = 0;
         }
 
         int length;
         if (!list.elements.isEmpty()) {
-            RuntimeDataProvider value = list.elements.removeFirst();
+            RuntimeBase value = list.elements.removeFirst();
             length = value.scalar().getInt();
         } else {
             length = size;
@@ -742,7 +742,7 @@ public static RuntimeList splice(RuntimeArray runtimeArray, RuntimeList list) {
      * @param value The list of files to be deleted.
      * @return A RuntimeScalar indicating the result of the unlink operation.
      */
-    public static RuntimeBase unlink(RuntimeDataProvider value, int ctx) {
+    public static RuntimeBase unlink(RuntimeBase value, int ctx) {
 
         boolean allDeleted = true;
         RuntimeList fileList = value.getList();
@@ -765,7 +765,7 @@ public static RuntimeBase unlink(RuntimeDataProvider value, int ctx) {
         return getScalarBoolean(allDeleted);
     }
 
-    public static RuntimeBase reverse(RuntimeDataProvider value, int ctx) {
+    public static RuntimeBase reverse(RuntimeBase value, int ctx) {
         if (ctx == RuntimeContextType.SCALAR) {
             StringBuilder sb = new StringBuilder();
 
@@ -801,7 +801,7 @@ public static RuntimeBase reverse(RuntimeDataProvider value, int ctx) {
         }
     }
 
-    public static RuntimeBase repeat(RuntimeDataProvider value, RuntimeScalar timesScalar, int ctx) {
+    public static RuntimeBase repeat(RuntimeBase value, RuntimeScalar timesScalar, int ctx) {
         int times = timesScalar.getInt();
         if (ctx == RuntimeContextType.SCALAR || value instanceof RuntimeScalar) {
             StringBuilder sb = new StringBuilder();

src/main/java/org/perlonjava/operators/OperatorHandler.java

@@ -124,12 +124,12 @@ public class OperatorHandler {
         put("select", "select", "org/perlonjava/operators/Operator", "(Lorg/perlonjava/runtime/RuntimeList;I)Lorg/perlonjava/runtime/RuntimeScalar;");
         put("caller", "caller", "org/perlonjava/runtime/RuntimeCode", "(Lorg/perlonjava/runtime/RuntimeList;I)Lorg/perlonjava/runtime/RuntimeList;");
         put("reset", "reset", "org/perlonjava/runtime/RuntimeScalar", "(Lorg/perlonjava/runtime/RuntimeList;I)Lorg/perlonjava/runtime/RuntimeList;");
-        put("warn", "warn", "org/perlonjava/operators/WarnDie", "(Lorg/perlonjava/runtime/RuntimeDataProvider;Lorg/perlonjava/runtime/RuntimeScalar;)Lorg/perlonjava/runtime/RuntimeBase;");
-        put("die", "die", "org/perlonjava/operators/WarnDie", "(Lorg/perlonjava/runtime/RuntimeDataProvider;Lorg/perlonjava/runtime/RuntimeScalar;)Lorg/perlonjava/runtime/RuntimeBase;");
+        put("warn", "warn", "org/perlonjava/operators/WarnDie", "(Lorg/perlonjava/runtime/RuntimeBase;Lorg/perlonjava/runtime/RuntimeScalar;)Lorg/perlonjava/runtime/RuntimeBase;");
+        put("die", "die", "org/perlonjava/operators/WarnDie", "(Lorg/perlonjava/runtime/RuntimeBase;Lorg/perlonjava/runtime/RuntimeScalar;)Lorg/perlonjava/runtime/RuntimeBase;");
         put("exit", "exit", "org/perlonjava/operators/WarnDie", "(Lorg/perlonjava/runtime/RuntimeScalar;)Lorg/perlonjava/runtime/RuntimeScalar;");
-        put("reverse", "reverse", "org/perlonjava/operators/Operator", "(Lorg/perlonjava/runtime/RuntimeDataProvider;I)Lorg/perlonjava/runtime/RuntimeBase;");
+        put("reverse", "reverse", "org/perlonjava/operators/Operator", "(Lorg/perlonjava/runtime/RuntimeBase;I)Lorg/perlonjava/runtime/RuntimeBase;");
         put("crypt", "crypt", "org/perlonjava/operators/Crypt", "(Lorg/perlonjava/runtime/RuntimeList;)Lorg/perlonjava/runtime/RuntimeScalar;");
-        put("unlink", "unlink", "org/perlonjava/operators/Operator", "(Lorg/perlonjava/runtime/RuntimeDataProvider;I)Lorg/perlonjava/runtime/RuntimeBase;");
+        put("unlink", "unlink", "org/perlonjava/operators/Operator", "(Lorg/perlonjava/runtime/RuntimeBase;I)Lorg/perlonjava/runtime/RuntimeBase;");
         put("stat", "stat", "org/perlonjava/operators/Stat", "(Lorg/perlonjava/runtime/RuntimeScalar;)Lorg/perlonjava/runtime/RuntimeList;");
         put("lstat", "lstat", "org/perlonjava/operators/Stat", "(Lorg/perlonjava/runtime/RuntimeScalar;)Lorg/perlonjava/runtime/RuntimeList;");
         put("vec", "vec", "org/perlonjava/operators/Vec", "(Lorg/perlonjava/runtime/RuntimeList;)Lorg/perlonjava/runtime/RuntimeScalar;");
@@ -141,7 +141,7 @@ public class OperatorHandler {
         put("read", "read", "org/perlonjava/operators/Readline", "(Lorg/perlonjava/runtime/RuntimeList;)Lorg/perlonjava/runtime/RuntimeScalar;");
 
         put("x", "repeat", "org/perlonjava/runtime/RuntimeScalar", "(Lorg/perlonjava/runtime/RuntimeScalar;Lorg/perlonjava/runtime/RuntimeScalar;)Lorg/perlonjava/runtime/RuntimeScalar;");
-        put("join", "join", "org/perlonjava/operators/Operator", "(Lorg/perlonjava/runtime/RuntimeScalar;Lorg/perlonjava/runtime/RuntimeDataProvider;)Lorg/perlonjava/runtime/RuntimeScalar;");
+        put("join", "join", "org/perlonjava/operators/Operator", "(Lorg/perlonjava/runtime/RuntimeScalar;Lorg/perlonjava/runtime/RuntimeBase;)Lorg/perlonjava/runtime/RuntimeScalar;");
         put("split", "split", "org/perlonjava/operators/Operator", "(Lorg/perlonjava/runtime/RuntimeScalar;Lorg/perlonjava/runtime/RuntimeList;)Lorg/perlonjava/runtime/RuntimeList;");
 
         put("truncate", "truncate", "org/perlonjava/operators/Operator", "(Lorg/perlonjava/runtime/RuntimeScalar;Lorg/perlonjava/runtime/RuntimeList;)Lorg/perlonjava/runtime/RuntimeScalar;");
@@ -164,8 +164,8 @@ public class OperatorHandler {
         put("pop", "pop", "org/perlonjava/runtime/RuntimeArray", "(Lorg/perlonjava/runtime/RuntimeArray;)Lorg/perlonjava/runtime/RuntimeScalar;");
         put("shift", "shift", "org/perlonjava/runtime/RuntimeArray", "(Lorg/perlonjava/runtime/RuntimeArray;)Lorg/perlonjava/runtime/RuntimeScalar;");
         put("splice", "splice", "org/perlonjava/operators/Operator", "(Lorg/perlonjava/runtime/RuntimeArray;Lorg/perlonjava/runtime/RuntimeList;)Lorg/perlonjava/runtime/RuntimeList;");
-        put("push", "push", "org/perlonjava/runtime/RuntimeArray", "(Lorg/perlonjava/runtime/RuntimeArray;Lorg/perlonjava/runtime/RuntimeDataProvider;)Lorg/perlonjava/runtime/RuntimeScalar;");
-        put("unshift", "unshift", "org/perlonjava/runtime/RuntimeArray", "(Lorg/perlonjava/runtime/RuntimeArray;Lorg/perlonjava/runtime/RuntimeDataProvider;)Lorg/perlonjava/runtime/RuntimeScalar;");
+        put("push", "push", "org/perlonjava/runtime/RuntimeArray", "(Lorg/perlonjava/runtime/RuntimeArray;Lorg/perlonjava/runtime/RuntimeBase;)Lorg/perlonjava/runtime/RuntimeScalar;");
+        put("unshift", "unshift", "org/perlonjava/runtime/RuntimeArray", "(Lorg/perlonjava/runtime/RuntimeArray;Lorg/perlonjava/runtime/RuntimeBase;)Lorg/perlonjava/runtime/RuntimeScalar;");
 
         put("undef", "undef", "org/perlonjava/runtime/RuntimeScalar", "()Lorg/perlonjava/runtime/RuntimeScalar;");
         put("wantarray", "wantarray", "org/perlonjava/runtime/RuntimeScalar", "(I)Lorg/perlonjava/runtime/RuntimeScalar;");

src/main/java/org/perlonjava/operators/Readline.java

@@ -12,7 +12,7 @@ public class Readline {
      *
      * @param fileHandle The file handle.
      * @param ctx        The context (SCALAR or LIST).
-     * @return A RuntimeDataProvider with the line(s).
+     * @return A RuntimeBase with the line(s).
      */
     public static RuntimeBase readline(RuntimeScalar fileHandle, int ctx) {
         RuntimeIO fh = fileHandle.getRuntimeIO();

src/main/java/org/perlonjava/operators/ScalarGlobOperator.java

@@ -65,7 +65,7 @@ public ScalarGlobOperator(String pattern) {
      * @param id the unique identifier for this glob operator instance
      * @param patternArg the glob pattern as a RuntimeScalar
      * @param ctx the runtime context (scalar or list)
-     * @return RuntimeDataProvider containing the results
+     * @return RuntimeBase containing the results
      */
     public static RuntimeBase evaluate(int id, RuntimeScalar patternArg, int ctx) {
         String pattern = patternArg.toString();

src/main/java/org/perlonjava/operators/SystemOperator.java

@@ -26,12 +26,12 @@ public class SystemOperator {
     private static final Pattern SHELL_METACHARACTERS = Pattern.compile("[*?\\[\\]{}()<>|&;`'\"\\\\$\\s]");
 
     /**
-     * Executes a system command and returns the output as a RuntimeDataProvider.
+     * Executes a system command and returns the output as a RuntimeBase.
      * This implements Perl's backtick operator (`command`).
      *
      * @param command The command to execute as a RuntimeScalar.
      * @param ctx     The context type, determining the return type (list or scalar).
-     * @return The output of the command as a RuntimeDataProvider.
+     * @return The output of the command as a RuntimeBase.
      * @throws PerlCompilerException if an error occurs during command execution or stream handling.
      */
     public static RuntimeBase systemCommand(RuntimeScalar command, int ctx) {
@@ -232,7 +232,7 @@ private static void closeQuietly(BufferedReader reader) {
      *
      * @param output The command output as a String.
      * @param ctx    The context type, determining the return type (list or scalar).
-     * @return The processed output as a RuntimeDataProvider.
+     * @return The processed output as a RuntimeBase.
      */
     private static RuntimeBase processOutput(String output, int ctx) {
         if (ctx == RuntimeContextType.LIST) {

src/main/java/org/perlonjava/operators/WarnDie.java

@@ -19,9 +19,9 @@ public class WarnDie {
      *
      * @param message The warning message to be issued.
      * @param where   Additional context or location information to append to the message.
-     * @return A RuntimeDataProvider representing the result of the warning operation.
+     * @return A RuntimeBase representing the result of the warning operation.
      */
-    public static RuntimeBase warn(RuntimeDataProvider message, RuntimeScalar where) {
+    public static RuntimeBase warn(RuntimeBase message, RuntimeScalar where) {
         String out = message.toString();
         if (out.isEmpty()) {
             RuntimeScalar err = getGlobalVariable("main::@");
@@ -68,10 +68,10 @@ public static RuntimeBase warn(RuntimeDataProvider message, RuntimeScalar where)
      *
      * @param value   The error message to be issued.
      * @param message Additional context or location information to append to the message.
-     * @return A RuntimeDataProvider representing the result of the die operation.
+     * @return A RuntimeBase representing the result of the die operation.
      * @throws PerlCompilerException if no custom die handler is defined.
      */
-    public static RuntimeBase die(RuntimeDataProvider value, RuntimeScalar message) {
+    public static RuntimeBase die(RuntimeBase value, RuntimeScalar message) {
         String out = value.toString();
         if (out.isEmpty()) {
             RuntimeScalar err = getGlobalVariable("main::@");

src/main/java/org/perlonjava/runtime/PerlRange.java

@@ -11,7 +11,7 @@
  * This class supports both integer and string ranges, providing
  * an iterator to traverse through the range.
  */
-public class PerlRange extends RuntimeBase implements RuntimeDataProvider, Iterable<RuntimeScalar> {
+public class PerlRange extends RuntimeBase implements Iterable<RuntimeScalar> {
     private final RuntimeScalar start;
     private final RuntimeScalar end;
 
@@ -76,10 +76,10 @@ public Iterator<RuntimeScalar> iterator() {
     /**
      * Converts the range to an undefined state.
      *
-     * @return A RuntimeDataProvider representing the undefined state.
+     * @return A RuntimeBase representing the undefined state.
      */
     @Override
-    public RuntimeDataProvider undefine() {
+    public RuntimeBase undefine() {
         return toList().undefine();
     }