TruffleRLanguage#toString: treat primitive values from promises as R vectors

steve-s · steve-s · commit d23f69f42069 · 2019-04-01T14:42:48.000+02:00
diff --git a/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/TruffleRLanguageImpl.java b/com.oracle.truffle.r.engine/src/com/oracle/truffle/r/engine/TruffleRLanguageImpl.java
@@ -47,7 +47,6 @@
 import com.oracle.truffle.r.nodes.instrumentation.RSyntaxTags.FunctionBodyBlockTag;
 import com.oracle.truffle.r.runtime.ArgumentsSignature;
 import com.oracle.truffle.r.runtime.ExitException;
-import com.oracle.truffle.r.runtime.RInternalError;
 import com.oracle.truffle.r.runtime.context.FastROptions;
 import com.oracle.truffle.r.runtime.RAccuracyInfo;
 import com.oracle.truffle.r.runtime.RCaller;
@@ -142,6 +141,15 @@ protected void disposeContext(RContext context) {
 
     @Override
     protected String toString(RContext context, Object value) {
+        // primitive values are never produced by FastR so we don't print them as R vectors
+        if (value instanceof Boolean) {
+            // boolean constants are capitalized like in R
+            return (boolean) value ? "TRUE" : "FALSE";
+        }
+        if (value instanceof Number || value instanceof String || value instanceof Character) {
+            return value.toString();
+        }
+
         // the debugger also passes result of TruffleRLanguage.findMetaObject() to this method
         Object unwrapped = value;
         // print promises by other means than the "print" function to avoid evaluating them
@@ -157,14 +165,14 @@ protected String toString(RContext context, Object value) {
         if (RMissingHelper.isMissing(unwrapped)) {
             return "missing";
         }
-        // primitive values are never produced by FastR so we don't print them as R vectors
-        if (unwrapped instanceof Number || unwrapped instanceof String || unwrapped instanceof Boolean || unwrapped instanceof Character) {
-            return unwrapped.toString();
-        }
         // special class designated to exchange NA values with the outside world
         if (unwrapped instanceof RInteropNA) {
             unwrapped = ((RInteropNA) unwrapped).getValue();
         }
+
+        // the value unwrapped from an RPromise can be primitive Java type, but now we know that we
+        // are dealing with primitive that is supposed to be treated as R vector
+        unwrapped = RRuntime.asAbstractVector(unwrapped);
         if (!(unwrapped instanceof TruffleObject)) {
             throw RError.error(RError.NO_CALLER, Message.GENERIC, String.format("Printing value of type '%s' is not supported by the R language.", unwrapped.getClass().getSimpleName()));
         }
diff --git a/com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/RMain.java b/com.oracle.truffle.r.launcher/src/com/oracle/truffle/r/launcher/RMain.java
@@ -36,7 +36,6 @@
 import org.graalvm.options.OptionCategory;
 import org.graalvm.polyglot.Context;
 import org.graalvm.polyglot.Context.Builder;
-import org.graalvm.polyglot.HostAccess;
 import org.graalvm.polyglot.PolyglotException;
 import org.graalvm.polyglot.Source;
 
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/tck/FastRDebugTest.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/tck/FastRDebugTest.java
@@ -650,6 +650,7 @@ private void assertLocation(final int line, final String code, final Object... e
     }
 
     private void assertLocation(final int line, final int column, final SuspendAnchor anchor, final String code, boolean includeAncestors, boolean completeMatch, final Object... expectedFrame) {
+        final RuntimeException trace = new RuntimeException();
         run.addLast(() -> {
             try {
                 assertNotNull(suspendedEvent);
@@ -685,6 +686,7 @@ private void assertLocation(final int line, final int column, final SuspendAncho
                 frame.getScope().getDeclaredValues().forEach(var -> {
                     System.out.println(var);
                 });
+                trace.printStackTrace();
                 throw e;
             }
         });
@@ -702,6 +704,7 @@ private void assertLocation(final int line, final int column, final SuspendAncho
      * @param expectedFrame the key-value pairs (e.g. {@code "id0", 1, "id1", "strValue"})
      */
     private void assertScope(final int line, final String code, boolean includeAncestors, boolean completeMatch, final Object... expectedFrame) {
+        final RuntimeException trace = new RuntimeException();
         run.addLast(() -> {
             try {
                 compareScope(line, code, includeAncestors, completeMatch, expectedFrame);
@@ -711,12 +714,14 @@ private void assertScope(final int line, final String code, boolean includeAnces
                 frame.getScope().getDeclaredValues().forEach(var -> {
                     System.out.println(var);
                 });
+                trace.printStackTrace();
                 throw e;
             }
         });
     }
 
     private void assertArguments(final int line, final String code, final Object... expectedArgs) {
+        final RuntimeException trace = new RuntimeException();
         run.addLast(() -> {
             final DebugStackFrame frame = suspendedEvent.getTopStackFrame();
             DebugScope scope = frame.getScope();
@@ -746,6 +751,7 @@ private void assertArguments(final int line, final String code, final Object...
                 scope.getDeclaredValues().forEach(var -> {
                     System.out.println(var);
                 });
+                trace.printStackTrace();
                 throw e;
             }
         });
@@ -838,6 +844,7 @@ private void assertExecutedOK() throws Throwable {
      * @param nameAndValuePairs name followed by value (arbitrary number of times).
      */
     private void assertMetaObjectsOrStringValues(final Source expectedSource, boolean metaObjects, final String... nameAndValuePairs) {
+        final RuntimeException trace = new RuntimeException();
         run.addLast((Runnable) () -> {
             try {
                 DebugStackFrame frame = suspendedEvent.getTopStackFrame();
@@ -877,6 +884,7 @@ private void assertMetaObjectsOrStringValues(final Source expectedSource, boolea
                 frame.getScope().getDeclaredValues().forEach(var -> {
                     System.out.println(var);
                 });
+                trace.printStackTrace();
                 throw e;
             }
         });
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/tck/ToStringTesterInstrument.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/tck/ToStringTesterInstrument.java
@@ -23,42 +23,38 @@
 package com.oracle.truffle.r.test.tck;
 
 import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.instrumentation.EventContext;
 import com.oracle.truffle.api.instrumentation.ExecutionEventNode;
-import com.oracle.truffle.api.instrumentation.ExecutionEventNodeFactory;
 import com.oracle.truffle.api.instrumentation.SourceSectionFilter;
 import com.oracle.truffle.api.instrumentation.TruffleInstrument;
 import com.oracle.truffle.api.nodes.LanguageInfo;
-import com.oracle.truffle.r.test.tck.ToStringTesterInstrument.Initialize;
+import com.oracle.truffle.r.test.tck.ToStringTesterInstrument.TestData;
 
-@TruffleInstrument.Registration(id = ToStringTesterInstrument.ID, name = ToStringTesterInstrument.ID, version = "1.0", services = Initialize.class)
+@TruffleInstrument.Registration(id = ToStringTesterInstrument.ID, name = ToStringTesterInstrument.ID, version = "1.0", services = TestData.class)
 public class ToStringTesterInstrument extends TruffleInstrument {
     public static final String ID = "ToStringTester";
 
-    static String intAsString;
-    static String byteAsString;
-    static String doubleAsString;
-    static String stringAsString;
-    static String booleanAsString;
-
     @Override
     protected void onCreate(Env env) {
-        env.registerService(new Initialize() {
-        });
-
+        TestData testData = new TestData();
+        env.registerService(testData);
         env.getInstrumenter().attachExecutionEventFactory(SourceSectionFilter.ANY, context -> new ExecutionEventNode() {
             @Override
             protected void onEnter(VirtualFrame frame) {
                 LanguageInfo rLanguage = env.getLanguages().get("R");
-                intAsString = env.toString(rLanguage, 42);
-                byteAsString = env.toString(rLanguage, (byte) 42);
-                doubleAsString = env.toString(rLanguage, 42.5);
-                stringAsString = env.toString(rLanguage, "Hello");
-                booleanAsString = env.toString(rLanguage, true);
+                testData.intAsString = env.toString(rLanguage, 42);
+                testData.byteAsString = env.toString(rLanguage, (byte) 42);
+                testData.doubleAsString = env.toString(rLanguage, 42.5);
+                testData.stringAsString = env.toString(rLanguage, "Hello");
+                testData.booleanAsString = env.toString(rLanguage, true);
             }
         });
     }
 
-    public interface Initialize {
+    public static final class TestData {
+        public String intAsString;
+        public String byteAsString;
+        public String doubleAsString;
+        public String stringAsString;
+        public String booleanAsString;
     }
 }
diff --git a/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/tck/TruffleRLanguageTest.java b/com.oracle.truffle.r.test/src/com/oracle/truffle/r/test/tck/TruffleRLanguageTest.java
@@ -30,6 +30,7 @@
 
 import com.oracle.truffle.r.test.TestBase;
 import com.oracle.truffle.r.test.generate.FastRSession;
+import com.oracle.truffle.r.test.tck.ToStringTesterInstrument.TestData;
 
 public class TruffleRLanguageTest extends TestBase {
 
@@ -47,13 +48,13 @@ public void dispose() {
 
     @Test
     public void testToString() {
-        context.getEngine().getInstruments().get(ToStringTesterInstrument.ID).lookup(ToStringTesterInstrument.Initialize.class);
+        TestData testData = context.getEngine().getInstruments().get(ToStringTesterInstrument.ID).lookup(TestData.class);
         context.eval("R", "1+1");   // to trigger the instrument
-        assertEquals("42", ToStringTesterInstrument.intAsString);
-        assertEquals("42", ToStringTesterInstrument.byteAsString);
-        assertEquals("42.5", ToStringTesterInstrument.doubleAsString);
-        assertEquals("Hello", ToStringTesterInstrument.stringAsString);
-        assertEquals("true", ToStringTesterInstrument.booleanAsString);
+        assertEquals("42", testData.intAsString);
+        assertEquals("42", testData.byteAsString);
+        assertEquals("42.5", testData.doubleAsString);
+        assertEquals("Hello", testData.stringAsString);
+        assertEquals("true", testData.booleanAsString);
     }
 
 }
