[GR-20016] Made RRaw interop capable.

PullRequest: fastr/2422

Author: tomasstupka

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

@@ -23,12 +23,17 @@
 package com.oracle.truffle.r.runtime.data;
 
 import com.oracle.truffle.api.CompilerDirectives.ValueType;
+import com.oracle.truffle.api.interop.InteropLibrary;
+import com.oracle.truffle.api.interop.UnsupportedMessageException;
+import com.oracle.truffle.api.library.ExportLibrary;
+import com.oracle.truffle.api.library.ExportMessage;
 import com.oracle.truffle.r.runtime.RRuntime;
 
 @ValueType
-public final class RRaw {
+@ExportLibrary(InteropLibrary.class)
+public final class RRaw implements RTruffleObject {
 
-    protected final byte value;
+    private final byte value;
 
     RRaw(byte value) {
         this.value = value;
@@ -38,6 +43,79 @@ public byte getValue() {
         return value;
     }
 
+    @SuppressWarnings("static-method")
+    @ExportMessage
+    public boolean isNumber() {
+        return true;
+    }
+
+    @SuppressWarnings("static-method")
+    @ExportMessage
+    public boolean fitsInByte() {
+        return true;
+    }
+
+    @SuppressWarnings("static-method")
+    @ExportMessage
+    public byte asByte() {
+        return getValue();
+    }
+
+    @SuppressWarnings("static-method")
+    @ExportMessage
+    public boolean fitsInShort() {
+        return true;
+    }
+
+    @ExportMessage
+    public short asShort() throws UnsupportedMessageException {
+        return getInterop().asShort(getValue());
+    }
+
+    @SuppressWarnings("static-method")
+    @ExportMessage
+    public boolean fitsInInt() {
+        return true;
+    }
+
+    @ExportMessage
+    public int asInt() throws UnsupportedMessageException {
+        return getInterop().asInt(getValue());
+    }
+
+    @SuppressWarnings("static-method")
+    @ExportMessage
+    public boolean fitsInLong() {
+        return true;
+    }
+
+    @ExportMessage
+    public long asLong() throws UnsupportedMessageException {
+        return getInterop().asLong(getValue());
+    }
+
+    @SuppressWarnings("static-method")
+    @ExportMessage
+    public boolean fitsInFloat() {
+        return true;
+    }
+
+    @ExportMessage
+    public float asFloat() throws UnsupportedMessageException {
+        return getInterop().asFloat(getValue());
+    }
+
+    @SuppressWarnings("static-method")
+    @ExportMessage
+    public boolean fitsInDouble() {
+        return true;
+    }
+
+    @ExportMessage
+    public double asDouble() throws UnsupportedMessageException {
+        return getInterop().asDouble(getValue());
+    }
+
     @Override
     public boolean equals(Object obj) {
         if (obj instanceof RRaw) {
@@ -60,4 +138,7 @@ public static RRaw valueOf(byte value) {
         return new RRaw(value);
     }
 
+    private InteropLibrary getInterop() {
+        return InteropLibrary.getFactory().create(getValue());
+    }
 }

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

@@ -38,7 +38,6 @@
 import com.oracle.truffle.r.runtime.RRuntime;
 import com.oracle.truffle.r.runtime.data.RInteropComplex;
 import com.oracle.truffle.r.runtime.data.RInteropNA;
-import com.oracle.truffle.r.runtime.data.RInteropRaw;
 import com.oracle.truffle.r.runtime.data.RNull;
 
 /**
@@ -131,11 +130,6 @@ public Object doInteropComplex(RInteropComplex interopComplex, @SuppressWarnings
         return interopComplex.getValue();
     }
 
-    @Specialization
-    public Object doInteropRaw(RInteropRaw interopRaw, @SuppressWarnings("unused") boolean preserveByte, @SuppressWarnings("unused") boolean printWarning) {
-        return interopRaw.getValue();
-    }
-
     @Specialization(guards = "isNA(d)")
     public double doDoubleNA(@SuppressWarnings("unused") double d, @SuppressWarnings("unused") boolean preserveByte, @SuppressWarnings("unused") boolean printWarning) {
         return Double.NaN;

com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/interop/Foreign2R.java

@@ -35,7 +35,6 @@
 import com.oracle.truffle.r.runtime.data.RInteropComplex;
 import com.oracle.truffle.r.runtime.data.RInteropNA;
 import com.oracle.truffle.r.runtime.data.RInteropNA.RInteropComplexNA;
-import com.oracle.truffle.r.runtime.data.RInteropRaw;
 import com.oracle.truffle.r.runtime.data.RInteropScalar.RInteropByte;
 import com.oracle.truffle.r.runtime.data.RInteropScalar.RInteropChar;
 import com.oracle.truffle.r.runtime.data.RInteropScalar.RInteropFloat;
@@ -154,11 +153,6 @@ public Object doRawNoBox(RRaw vec, @SuppressWarnings("unused") boolean boxPrimit
         return vec.getValue();
     }
 
-    @Specialization(guards = "boxPrimitives")
-    public Object doRawBox(RRaw vec, @SuppressWarnings("unused") boolean boxPrimitives) {
-        return new RInteropRaw(vec);
-    }
-
     @Specialization
     public byte doInteroptByte(RInteropByte obj, @SuppressWarnings("unused") boolean boxPrimitives) {
         return obj.getValue();

com.oracle.truffle.r.runtime/src/com/oracle/truffle/r/runtime/interop/R2Foreign.java

@@ -23,7 +23,6 @@
 package com.oracle.truffle.r.test.engine.interop;
 
 import com.oracle.truffle.api.interop.TruffleObject;
-import com.oracle.truffle.r.runtime.data.RInteropRaw;
 import com.oracle.truffle.r.runtime.data.RRaw;
 import org.junit.Test;
 
@@ -46,7 +45,7 @@ protected boolean shouldTestToNative(TruffleObject obj) {
 
     @Override
     protected TruffleObject[] createTruffleObjects() throws Exception {
-        return new TruffleObject[]{new RInteropRaw(RRaw.valueOf((byte) 1))};
+        return new TruffleObject[]{RRaw.valueOf((byte) 1)};
     }
 
     @Test
@@ -57,7 +56,7 @@ public void testIsNull() throws Exception {
 
     @Override
     protected Object getUnboxed(TruffleObject obj) {
-        return ((RRaw) ((RInteropRaw) obj).getValue()).getValue();
+        return ((RRaw) obj).getValue();
     }
 
     @Override