handle foreign objects in transpose

Author: tomasstupka

com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/Transpose.java

@@ -26,7 +26,9 @@
 
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Fallback;
+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.api.object.DynamicObject;
 import com.oracle.truffle.api.profiles.BranchProfile;
 import com.oracle.truffle.api.profiles.LoopConditionProfile;
@@ -43,6 +45,7 @@
 import com.oracle.truffle.r.nodes.profile.VectorLengthProfile;
 import com.oracle.truffle.r.runtime.RError.Message;
 import com.oracle.truffle.r.runtime.RInternalError;
+import com.oracle.truffle.r.runtime.RRuntime;
 import com.oracle.truffle.r.runtime.RType;
 import com.oracle.truffle.r.runtime.builtins.RBuiltin;
 import com.oracle.truffle.r.runtime.data.RDataFactory;
@@ -56,9 +59,11 @@
 import com.oracle.truffle.r.runtime.data.nodes.VectorAccess;
 import com.oracle.truffle.r.runtime.data.nodes.VectorAccess.RandomIterator;
 import com.oracle.truffle.r.runtime.data.nodes.VectorReuse;
+import com.oracle.truffle.r.runtime.interop.ConvertForeignObjectNode;
 import com.oracle.truffle.r.runtime.nodes.RBaseNode;
 
 @RBuiltin(name = "t.default", kind = INTERNAL, parameterNames = {"x"}, behavior = PURE)
+@ImportStatic({RRuntime.class, ConvertForeignObjectNode.class})
 public abstract class Transpose extends RBuiltinNode.Arg1 {
 
     private final BranchProfile hasDimNamesProfile = BranchProfile.create();
@@ -80,6 +85,10 @@ public abstract class Transpose extends RBuiltinNode.Arg1 {
         Casts.noCasts(Transpose.class);
     }
 
+    protected static Transpose create() {
+        return TransposeNodeGen.create();
+    }
+
     public abstract Object execute(RAbstractVector o);
 
     protected boolean isSquare(RAbstractVector vector) {
@@ -274,6 +283,17 @@ private void convertNamesToDimnames(RAbstractVector source, RAbstractVector dest
         }
     }
 
+    @Specialization(guards = {"isForeignObject(x)"})
+    protected Object transposeForeign(TruffleObject x,
+                    @Cached("create()") ConvertForeignObjectNode convertForeign,
+                    @Cached("create()") Transpose recursive) {
+        if (convertForeign.isForeignArray(x)) {
+            RAbstractVector vec = (RAbstractVector) convertForeign.convert(x);
+            return recursive.execute(vec);
+        }
+        throw error(Message.ARGUMENT_NOT_MATRIX);
+    }
+
     @Fallback
     protected RVector<?> transpose(@SuppressWarnings("unused") Object x) {
         throw error(Message.ARGUMENT_NOT_MATRIX);

com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/fastr/TestJavaInterop.java

@@ -656,6 +656,13 @@ public void testIdentical() {
         assertEvalFastR("b1 <- .fastr.interop.asByte(1); s1 <- .fastr.interop.asShort(1); identical(b1, s1)", "FALSE");
     }
 
+    @Test
+    public void testTranspose() {
+        assertEvalFastR(CREATE_TEST_ARRAYS + " t(ta$stringArray)", "t(c('a', 'b', 'c'))");
+        assertEvalFastR(CREATE_TEST_ARRAYS + " t(ta$stringArray2)", "t(matrix(c('a', 'a', 'b', 'b', 'c', 'c'), c(2, 3)))");
+        assertEvalFastR(CREATE_TEST_ARRAYS + " t(ta)", errorIn("t.default(ta)", "argument is not a matrix"));
+    }
+
     @Test
     public void testAsVectorFromArray() throws NoSuchFieldException, IllegalArgumentException, IllegalAccessException {
         testAsVectorFromArray("fieldStaticBooleanArray", "logical");