[GR-2798] A few smaller fixes in interop.

PullRequest: fastr/1752

Author: tomasstupka

com.oracle.truffle.r.nodes.builtin/src/com/oracle/truffle/r/nodes/builtin/base/R/polyglot.value_overrides.R

@@ -32,9 +32,5 @@ as.array.polyglot.value <- function(x, ...) {
 as.data.frame.polyglot.value <- function(x, row.names = NULL, optional = FALSE, ..., nm = paste(deparse(substitute(x), 
     width.cutoff = 500L), collapse = " ")) {
     v <- .fastr.interop.asVector(x, recursive=TRUE, dropDimensions=FALSE)
-    if (!optional && !is.null(v) && is.atomic(v)) {
-        v <- list(v)        
-        names(v) <- nm
-    }    
-    as.data.frame(v, row.names=row.names, optional=optional, ...)
+    as.data.frame(v, row.names=row.names, optional=optional, nm=nm, ...)
 }

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.nodes/src/com/oracle/truffle/r/nodes/control/RLengthNode.java

@@ -42,15 +42,14 @@
 import com.oracle.truffle.r.runtime.data.RSymbol;
 import com.oracle.truffle.r.runtime.data.model.RAbstractContainer;
 import com.oracle.truffle.r.runtime.env.REnvironment;
-import com.oracle.truffle.r.runtime.interop.ConvertForeignObjectNode;
 import com.oracle.truffle.r.runtime.nodes.RBaseNode;
 
 /**
  * Gets length of given container. Does not actually dispatch to the 'length' function, which may be
  * overridden for some S3/S4 classes. Check if you need to get actual length, or what the 'length'
  * function returns, like in {@code seq_along}.
  */
-@ImportStatic({Message.class, ConvertForeignObjectNode.class})
+@ImportStatic({Message.class})
 public abstract class RLengthNode extends RBaseNode {
 
     public abstract int executeInteger(Object value);

com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/ExpectedTestOutput.test

@@ -154239,6 +154239,22 @@ Error in .fastr.interop.asChar(97L, 1) :
 #if (!any(R.version$engine == "FastR")) { 32767 } else { v <- .fastr.interop.asShort(32767); v; }
 [1] 32767
 
+##com.oracle.truffle.r.test.library.fastr.TestJavaInterop.testTranspose#
+#if (!any(R.version$engine == "FastR")) { cat('Error in t.default(ta) : argument is not a matrix', '<<<NEWLINE>>>') } else { ta <- new('com.oracle.truffle.r.test.library.fastr.TestJavaInterop$TestArraysClass'); t(ta) }
+Error in t.default(ta) : argument is not a matrix
+
+##com.oracle.truffle.r.test.library.fastr.TestJavaInterop.testTranspose#
+#if (!any(R.version$engine == "FastR")) { t(c('a', 'b', 'c')) } else { ta <- new('com.oracle.truffle.r.test.library.fastr.TestJavaInterop$TestArraysClass'); t(ta$stringArray) }
+     [,1] [,2] [,3]
+[1,] "a"  "b"  "c"
+
+##com.oracle.truffle.r.test.library.fastr.TestJavaInterop.testTranspose#
+#if (!any(R.version$engine == "FastR")) { t(matrix(c('a', 'a', 'b', 'b', 'c', 'c'), c(2, 3))) } else { ta <- new('com.oracle.truffle.r.test.library.fastr.TestJavaInterop$TestArraysClass'); t(ta$stringArray2) }
+     [,1] [,2]
+[1,] "a"  "a"
+[2,] "b"  "b"
+[3,] "c"  "c"
+
 ##com.oracle.truffle.r.test.library.fastr.TestJavaInterop.testUnlist#
 #if (!any(R.version$engine == "FastR")) { 'character' } else { ta <- new('com.oracle.truffle.r.test.library.fastr.TestJavaInterop$TestArraysClass'); class(unlist(ta$charArray)) }
 [1] "character"

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");