deparse closures without forcing coercion

tomasstupka · tomasstupka · commit 796805e1b627 · 2019-10-25T17:43:38.000+02:00
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RDeparse.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/RDeparse.java
@@ -58,6 +58,11 @@
 import com.oracle.truffle.r.runtime.data.RS4Object;
 import com.oracle.truffle.r.runtime.data.RStringVector;
 import com.oracle.truffle.r.runtime.data.RSymbol;
+import com.oracle.truffle.r.runtime.data.closures.RClosure;
+import com.oracle.truffle.r.runtime.data.closures.RToComplexVectorClosure;
+import com.oracle.truffle.r.runtime.data.closures.RToDoubleVectorClosure;
+import com.oracle.truffle.r.runtime.data.closures.RToIntVectorClosure;
+import com.oracle.truffle.r.runtime.data.closures.RToStringVectorClosure;
 import com.oracle.truffle.r.runtime.data.model.RAbstractAtomicVector;
 import com.oracle.truffle.r.runtime.data.model.RAbstractComplexVector;
 import com.oracle.truffle.r.runtime.data.model.RAbstractIntVector;
@@ -1001,8 +1006,12 @@ private void appendVector(RAbstractAtomicVector vec) {
                 if (sequence != null) {
                     append(RRuntime.intToStringNoCheck(sequence.getStart())).append(':').append(RRuntime.intToStringNoCheck(sequence.getEnd()));
                 } else {
+                    if (vec instanceof RClosure) {
+                        append(closureToCoercionFunction((RClosure) vec));
+                    }
                     // TODO COMPAT?
                     append("c(");
+
                     for (int i = 0; i < len; i++) {
                         RStringVector names = vec.getNames();
                         if (names != null) {
@@ -1017,19 +1026,41 @@ private void appendVector(RAbstractAtomicVector vec) {
                                 append(" = ");
                             }
                         }
-                        vecElement2buff(vec.getDataAtAsObject(i), false);
+                        Object elem;
+                        if (vec instanceof RClosure) {
+                            elem = ((RClosure) vec).getDelegateDataAt(i);
+                        } else {
+                            elem = vec.getDataAtAsObject(i);
+                        }
+                        vecElement2buff(elem, false);
                         if (i < (len - 1)) {
                             append(", ");
                         }
                         lbreak = listLinebreak(lbreak);
                     }
                     append(')');
+                    if (vec instanceof RClosure) {
+                        append(")");
+                    }
                 }
             }
         }
 
+        private static String closureToCoercionFunction(RClosure vec) {
+            if (vec instanceof RToComplexVectorClosure) {
+                return "as.complex(";
+            } else if (vec instanceof RToDoubleVectorClosure) {
+                return "as.double(";
+            } else if (vec instanceof RToIntVectorClosure) {
+                return "as.integer(";
+            } else if (vec instanceof RToStringVectorClosure) {
+                return "as.character(";
+            }
+            throw RInternalError.shouldNotReachHere("unhandled closure type " + vec.getClass().getSimpleName());
+        }
+
         private static RIntSequence asIntSequence(RAbstractVector vec) {
-            if (!(vec instanceof RAbstractIntVector)) {
+            if (!(vec instanceof RAbstractIntVector) || vec instanceof RToIntVectorClosure) {
                 return null;
             }
             RAbstractIntVector intVec = (RAbstractIntVector) vec;
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/closures/RClosure.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/closures/RClosure.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 3 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 3 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+package com.oracle.truffle.r.runtime.data.closures;
+
+import com.oracle.truffle.r.runtime.data.model.RAbstractVector;
+
+public interface RClosure {
+    Object getDelegateDataAt(int idx);
+
+    RAbstractVector getDelegate();
+}
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/closures/RToComplexVectorClosure.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/closures/RToComplexVectorClosure.java
@@ -35,7 +35,7 @@
 import com.oracle.truffle.r.runtime.data.nodes.SlowPathVectorAccess.SlowPathFromComplexAccess;
 import com.oracle.truffle.r.runtime.data.nodes.VectorAccess;
 
-public class RToComplexVectorClosure extends RAbstractComplexVector {
+public class RToComplexVectorClosure extends RAbstractComplexVector implements RClosure {
 
     protected final boolean keepAttributes;
     private final RAbstractVector vector;
@@ -72,6 +72,11 @@ public Object getInternalStore() {
         return vector.getInternalStore();
     }
 
+    @Override
+    public RAbstractVector getDelegate() {
+        return vector;
+    }
+
     @Override
     public int getLength() {
         return vector.getLength();
@@ -99,6 +104,11 @@ public RComplex getDataAt(int index) {
         return spa.getComplex(spa.randomAccess(v), index);
     }
 
+    @Override
+    public Object getDelegateDataAt(int index) {
+        return vector.getDataAtAsObject(index);
+    }
+
     @Override
     public VectorAccess access() {
         return new FastPathAccess(this, vector.access());
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/closures/RToDoubleVectorClosure.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/closures/RToDoubleVectorClosure.java
@@ -33,7 +33,7 @@
 import com.oracle.truffle.r.runtime.data.nodes.SlowPathVectorAccess.SlowPathFromDoubleAccess;
 import com.oracle.truffle.r.runtime.data.nodes.VectorAccess;
 
-public class RToDoubleVectorClosure extends RAbstractDoubleVector {
+public class RToDoubleVectorClosure extends RAbstractDoubleVector implements RClosure {
 
     protected final boolean keepAttributes;
     private final RAbstractVector vector;
@@ -62,6 +62,11 @@ public Object getInternalStore() {
         return vector.getInternalStore();
     }
 
+    @Override
+    public RAbstractVector getDelegate() {
+        return vector;
+    }
+
     @Override
     public int getLength() {
         return vector.getLength();
@@ -88,6 +93,11 @@ public double getDataAt(int index) {
         return spa.getDouble(spa.randomAccess(vector), index);
     }
 
+    @Override
+    public Object getDelegateDataAt(int index) {
+        return vector.getDataAtAsObject(index);
+    }
+
     @CompilerDirectives.TruffleBoundary
     protected void copyAttributes(RIntVector materialized) {
         if (keepAttributes) {
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/closures/RToIntVectorClosure.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/closures/RToIntVectorClosure.java
@@ -33,7 +33,7 @@
 import com.oracle.truffle.r.runtime.data.nodes.SlowPathVectorAccess.SlowPathFromIntAccess;
 import com.oracle.truffle.r.runtime.data.nodes.VectorAccess;
 
-public class RToIntVectorClosure extends RAbstractIntVector {
+public class RToIntVectorClosure extends RAbstractIntVector implements RClosure {
 
     protected final boolean keepAttributes;
     private final RAbstractVector vector;
@@ -70,6 +70,11 @@ public Object getInternalStore() {
         return vector.getInternalStore();
     }
 
+    @Override
+    public RAbstractVector getDelegate() {
+        return vector;
+    }
+
     @Override
     public int getLength() {
         return vector.getLength();
@@ -97,6 +102,11 @@ public int getDataAt(int index) {
         return spa.getInt(spa.randomAccess(v), index);
     }
 
+    @Override
+    public Object getDelegateDataAt(int index) {
+        return vector.getDataAtAsObject(index);
+    }
+
     @Override
     public VectorAccess access() {
         return new FastPathAccess(this, vector.access());
diff --git a/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/closures/RToStringVectorClosure.java b/com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/data/closures/RToStringVectorClosure.java
@@ -38,7 +38,7 @@
 import com.oracle.truffle.r.runtime.data.nodes.SlowPathVectorAccess.SlowPathFromStringAccess;
 import com.oracle.truffle.r.runtime.data.nodes.VectorAccess;
 
-public class RToStringVectorClosure extends RAbstractStringVector {
+public class RToStringVectorClosure extends RAbstractStringVector implements RClosure {
     protected final boolean keepAttributes;
     protected final RAbstractVector vector;
 
@@ -73,6 +73,7 @@ public Object getInternalStore() {
         return vector.getInternalStore();
     }
 
+    @Override
     public RAbstractVector getDelegate() {
         return vector;
     }
@@ -103,6 +104,11 @@ public String getDataAt(int index) {
         return spa.getString(spa.randomAccess(vector), index);
     }
 
+    @Override
+    public Object getDelegateDataAt(int index) {
+        return vector.getDataAtAsObject(index);
+    }
+
     @Override
     public VectorAccess access() {
         return new FastPathAccess(this, vector.access());
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/ExpectedTestOutput.test b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/ExpectedTestOutput.test
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/fastr/TestJavaInterop.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/library/fastr/TestJavaInterop.java
