cleanup

Author: fglock

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

@@ -921,12 +921,7 @@ private void handleSetOperator(BinaryOperatorNode node) throws Exception {
                 nodeRight.accept(this.with(RuntimeContextType.LIST));   // emit the value
                 node.left.accept(this.with(RuntimeContextType.LIST));   // emit the variable
                 mv.visitInsn(Opcodes.SWAP); // move the target first
-                mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "org/perlonjava/runtime/RuntimeDataProvider", "set", "(Lorg/perlonjava/runtime/RuntimeList;)Lorg/perlonjava/runtime/RuntimeList;", true);
-                if (ctx.contextType == RuntimeContextType.SCALAR) {
-                    // Transform the value in the stack to Scalar
-                    // XXX HERE
-                    mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "org/perlonjava/runtime/RuntimeDataProvider", "count", "()Lorg/perlonjava/runtime/RuntimeScalar;", true);
-                }
+                mv.visitMethodInsn(Opcodes.INVOKEINTERFACE, "org/perlonjava/runtime/RuntimeDataProvider", "set", "(Lorg/perlonjava/runtime/RuntimeList;)Lorg/perlonjava/runtime/RuntimeArray;", true);
                 break;
             default:
                 throw new IllegalArgumentException("Unsupported assignment context: " + lvalueContext);

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

@@ -112,10 +112,10 @@ public RuntimeArray set(RuntimeScalar value) {
     }
 
     // Replace the whole array with the elements of a list
-    public RuntimeList set(RuntimeList value) {
+    public RuntimeArray set(RuntimeList value) {
         this.elements.clear();
         value.addToArray(this);
-        return new RuntimeList(this);
+        return this;
     }
 
     // Set a value at a specific index

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

@@ -75,7 +75,7 @@ public interface RuntimeDataProvider {
      * @param list The RuntimeList object
      * @return list
      */
-    RuntimeList set(RuntimeList list);
+    RuntimeArray set(RuntimeList list);
 
     /**
      * Retrives the result of keys() as a RuntimeArray instance.

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

@@ -107,8 +107,8 @@ public RuntimeScalar addToScalar(RuntimeScalar scalar) {
         return scalar.set(this);
     }
 
-    public RuntimeList set(RuntimeList value) {
-        return new RuntimeList(this.set(value.scalar()));
+    public RuntimeArray set(RuntimeList value) {
+        return new RuntimeArray(this.set(value.scalar()));
     }
 
     // keys() operator

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

@@ -67,15 +67,15 @@ public RuntimeScalar addToScalar(RuntimeScalar scalar) {
     }
 
     // Replace the whole hash with the elements of a list
-    public RuntimeList set(RuntimeList value) {
+    public RuntimeArray set(RuntimeList value) {
         RuntimeArray arr = new RuntimeArray();
         value.addToArray(arr);
         if (arr.size() % 2 != 0) {  // add an undef if the array size is odd
             arr.push(new RuntimeScalar());
         }
         RuntimeHash hash = fromArray(arr);
         this.elements = hash.elements;
-        return new RuntimeList(this);
+        return new RuntimeArray(new RuntimeList(this));
     }
 
     // Add a key-value pair to the hash

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

@@ -133,17 +133,15 @@ public RuntimeScalar scalar() {
     // In LIST context returns the ARG LIST
     // In SCALAR context returns the number of elements in ARG LIST
     //
-    public RuntimeList set(RuntimeList value) {
-
-        // preserve the right side as return value from the method
-        RuntimeList original = new RuntimeList();
-        for (RuntimeBaseEntity elem : value.elements) {
-            original.add(elem);
-        }
+    public RuntimeArray set(RuntimeList value) {
 
         // flatten the right side
+        RuntimeArray original = new RuntimeArray();
+        value.addToArray(original);
+
+        // retrieve the list
         RuntimeArray arr = new RuntimeArray();
-        value.addToArray(arr);
+        original.addToArray(arr);
 
         for (RuntimeBaseEntity elem : elements) {
             if (elem instanceof RuntimeScalar) {
@@ -157,7 +155,7 @@ public RuntimeList set(RuntimeList value) {
                 arr.elements = new ArrayList<>();
             }
         }
-        return new RuntimeList(original);
+        return original;
     }
 
     // Convert the list to a string

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

@@ -347,8 +347,8 @@ public RuntimeScalar set(RuntimeGlob value) {
         return this;
     }
 
-    public RuntimeList set(RuntimeList value) {
-        return new RuntimeList(this.set(value.scalar()));
+    public RuntimeArray set(RuntimeList value) {
+        return new RuntimeArray(this.set(value.scalar()));
     }
 
     @Override