implemented createEmptySameType/copyResized/WithDimensions in RForeignWrapper-s - used from cbind/rbind/matrix

Author: tomasstupka

com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/CastToVectorNode.java

@@ -22,15 +22,22 @@
  */
 package com.oracle.truffle.r.nodes.unary;
 
+import com.oracle.truffle.api.dsl.Cached;
+import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.Specialization;
+import com.oracle.truffle.api.interop.TruffleObject;
 import com.oracle.truffle.r.runtime.RError;
+import com.oracle.truffle.r.runtime.RRuntime;
 import com.oracle.truffle.r.runtime.data.RDataFactory;
 import com.oracle.truffle.r.runtime.data.RFunction;
 import com.oracle.truffle.r.runtime.data.RMissing;
 import com.oracle.truffle.r.runtime.data.RNull;
 import com.oracle.truffle.r.runtime.data.RS4Object;
 import com.oracle.truffle.r.runtime.data.model.RAbstractVector;
+import com.oracle.truffle.r.runtime.env.REnvironment;
+import com.oracle.truffle.r.runtime.interop.ForeignArray2R;
 
+@ImportStatic(RRuntime.class)
 public abstract class CastToVectorNode extends CastNode {
 
     private final boolean preserveNonVector;
@@ -81,6 +88,29 @@ protected RAbstractVector cast(@SuppressWarnings("unused") RS4Object s4obj) {
         throw error(RError.Message.CANNOT_COERCE_S4_TO_VECTOR);
     }
 
+    @Specialization
+    protected Object cast(REnvironment env) {
+        if (preserveNonVector) {
+            return env;
+        } else {
+            return RDataFactory.createList();
+        }
+    }
+
+    @Specialization(guards = "isForeignObject(truffleObject)")
+    protected Object castForeign(TruffleObject truffleObject,
+                    @Cached("create()") ForeignArray2R foreignArray2R) {
+        if (preserveNonVector) {
+            return truffleObject;
+        } else {
+            Object o = foreignArray2R.convert(truffleObject);
+            if (!RRuntime.isForeignObject(o)) {
+                return o;
+            }
+        }
+        throw error(RError.Message.CANNOT_COERCE_EXTERNAL_OBJECT_TO_VECTOR, "vector");
+    }
+
     public static CastToVectorNode create() {
         return CastToVectorNodeGen.create(false);
     }

com.oracle.truffle.r.nodes/src/com/oracle/truffle/r/nodes/unary/PrecedenceNode.java

@@ -268,7 +268,7 @@ protected int doForeignArray(TruffleObject obj, boolean recursive,
             if (context.getEnv().isHostObject(obj)) {
                 Object o = context.getEnv().asHostObject(obj);
                 Class<?> ct = o.getClass().getComponentType();
-                int prc = getPrecedence(ct, recursive);
+                int prc = getPrecedence(ct);
                 if (prc != -1) {
                     return prc;
                 }
@@ -290,14 +290,10 @@ protected int doForeignArray(TruffleObject obj, boolean recursive,
     }
 
     @TruffleBoundary
-    private int getPrecedence(Class<?> ct, boolean recursive) {
-        if (recursive && ct != null && ct.isArray()) {
-            return getPrecedence(ct.getComponentType(), true);
+    private int getPrecedence(Class<?> ct) {
+        if (ct != null && ct.isArray()) {
+            return getPrecedence(ct.getComponentType());
         }
-        return getPrecedence(ct);
-    }
-
-    private static int getPrecedence(Class<?> ct) {
         if (ct == Integer.class || ct == Byte.class || ct == Short.class || ct == int.class || ct == byte.class || ct == short.class) {
             return INT_PRECEDENCE;
         } else if (ct == Double.class || ct == Float.class || ct == Long.class || ct == double.class || ct == float.class || ct == long.class) {

com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RForeignBooleanWrapper.java

@@ -87,6 +87,11 @@ private static byte unbox(TruffleObject value, ClassCastException e) throws Runt
         throw RInternalError.shouldNotReachHere(e);
     }
 
+    @Override
+    public RVector<?> createEmptySameType(int newLength, boolean newIsComplete) {
+        return RDataFactory.createLogicalVector(new byte[newLength], newIsComplete);
+    }
+
     private static final class FastPathAccess extends FastPathFromLogicalAccess {
 
         FastPathAccess(RAbstractContainer value) {

com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RForeignDoubleWrapper.java

@@ -88,6 +88,11 @@ private static double unbox(TruffleObject value, ClassCastException e) throws Ru
         throw RInternalError.shouldNotReachHere(e);
     }
 
+    @Override
+    public RVector<?> createEmptySameType(int newLength, boolean newIsComplete) {
+        return RDataFactory.createDoubleVector(new double[newLength], newIsComplete);
+    }
+
     private static final class FastPathAccess extends FastPathFromDoubleAccess {
 
         FastPathAccess(RAbstractContainer value) {

com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RForeignIntWrapper.java

@@ -88,6 +88,11 @@ private static int unbox(TruffleObject value, ClassCastException e) throws Runti
         throw RInternalError.shouldNotReachHere(e);
     }
 
+    @Override
+    public RVector<?> createEmptySameType(int newLength, boolean newIsComplete) {
+        return RDataFactory.createIntVector(new int[newLength], newIsComplete);
+    }
+
     private static final class FastPathAccess extends FastPathFromIntAccess {
 
         FastPathAccess(RAbstractContainer value) {

com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RForeignStringWrapper.java

@@ -85,6 +85,11 @@ private static String getString(TruffleObject truffleObjectIn, int index) throws
         }
     }
 
+    @Override
+    public RVector<?> createEmptySameType(int newLength, boolean newIsComplete) {
+        return RDataFactory.createStringVector(new String[newLength], newIsComplete);
+    }
+
     private static final class FastPathAccess extends FastPathFromStringAccess {
 
         FastPathAccess(RAbstractContainer value) {

com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/RForeignWrapper.java

@@ -97,12 +97,14 @@ public final RAbstractVector copy() {
 
     @Override
     public final RAbstractVector copyDropAttributes() {
-        throw RInternalError.shouldNotReachHere();
+        return copy();
     }
 
     @Override
     public final RAbstractVector copyWithNewDimensions(int[] newDimensions) {
-        throw RInternalError.shouldNotReachHere();
+        RAbstractVector res = copy();
+        res.setDimensions(newDimensions);
+        return res;
     }
 
     @Override
@@ -195,16 +197,18 @@ public Object getInternalStore() {
 
     @Override
     public final RVector<?> copyResized(int size, boolean fillNA) {
-        throw RInternalError.shouldNotReachHere();
+        RAbstractVector v = copy();
+        return v.copyResized(size, fillNA);
     }
 
     @Override
-    public final RVector<?> copyResizedWithDimensions(int[] newDimensions, boolean fillNA) {
-        throw RInternalError.shouldNotReachHere();
+    public RVector<?> copyResizedWithDimensions(int[] newDimensions, boolean fillNA) {
+        RAbstractVector v = copy();
+        return v.copyResizedWithDimensions(newDimensions, fillNA);
     }
 
     @Override
-    public final RVector<?> createEmptySameType(int newLength, boolean newIsComplete) {
+    public RVector<?> createEmptySameType(int newLength, boolean newIsComplete) {
         throw RInternalError.shouldNotReachHere();
     }