[GR-11414] Fix various problems with devtools package.

PullRequest: fastr/1666

Author: lukasstadler

com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/common/JavaUpCallsRFFIImpl.java

@@ -71,6 +71,7 @@
 import com.oracle.truffle.r.runtime.data.RArgsValuesAndNames;
 import com.oracle.truffle.r.runtime.data.RAttributable;
 import com.oracle.truffle.r.runtime.data.RAttributesLayout;
+import com.oracle.truffle.r.runtime.data.RComplex;
 import com.oracle.truffle.r.runtime.data.RComplexVector;
 import com.oracle.truffle.r.runtime.data.RDataFactory;
 import com.oracle.truffle.r.runtime.data.RDoubleVector;
@@ -84,6 +85,7 @@
 import com.oracle.truffle.r.runtime.data.RNull;
 import com.oracle.truffle.r.runtime.data.RObject;
 import com.oracle.truffle.r.runtime.data.RPromise;
+import com.oracle.truffle.r.runtime.data.RRaw;
 import com.oracle.truffle.r.runtime.data.RPromise.EagerPromise;
 import com.oracle.truffle.r.runtime.data.RRawVector;
 import com.oracle.truffle.r.runtime.data.RShareable;
@@ -140,6 +142,12 @@ private static RuntimeException implementedAsNode() {
     }
 
     // Checkstyle: stop method name check
+
+    @Override
+    public RComplexVector Rf_ScalarComplex(double real, double imag) {
+        return RDataFactory.createComplexVectorFromScalar(RComplex.valueOf(real, imag));
+    }
+
     @Override
     public RIntVector Rf_ScalarInteger(int value) {
         return RDataFactory.createIntVectorFromScalar(value);
@@ -156,6 +164,11 @@ public RLogicalVector Rf_ScalarLogical(int value) {
         return RDataFactory.createLogicalVectorFromScalar(byteValue);
     }
 
+    @Override
+    public RRawVector Rf_ScalarRaw(int value) {
+        return RDataFactory.createRawVectorFromScalar(RRaw.valueOf((byte) value));
+    }
+
     @Override
     public RDoubleVector Rf_ScalarReal(double value) {
         return RDataFactory.createDoubleVectorFromScalar(value);
@@ -465,7 +478,32 @@ public Object Rf_allocArray(int mode, Object dimsObj) {
         RAbstractVector result = (RAbstractVector) Rf_allocVector(mode, n);
         setDims(newDims, result);
         return result;
+    }
 
+    @Override
+    @TruffleBoundary
+    public Object Rf_allocList(int length) {
+        Object result = RNull.instance;
+        for (int i = 0; i < length; i++) {
+            result = RDataFactory.createPairList(RNull.instance, result);
+        }
+        return result;
+    }
+
+    @Override
+    @TruffleBoundary
+    public Object Rf_allocSExp(int mode) {
+        SEXPTYPE type = SEXPTYPE.mapInt(mode);
+        switch (type) {
+            case ENVSXP:
+                return RDataFactory.createNewEnv(null);
+            case LISTSXP:
+                return RDataFactory.createPairList(RNull.instance, RNull.instance);
+            case LANGSXP:
+                return RDataFactory.createPairList(1, type);
+            default:
+                throw unimplemented("unexpected SEXPTYPE " + type);
+        }
     }
 
     @TruffleBoundary

com.oracle.truffle.r.ffi.impl/src/com/oracle/truffle/r/ffi/impl/upcalls/StdUpCallsRFFI.java

@@ -156,10 +156,14 @@
 public interface StdUpCallsRFFI {
     // Checkstyle: stop method name check
 
+    Object Rf_ScalarComplex(double real, double imag);
+
     Object Rf_ScalarInteger(int value);
 
     Object Rf_ScalarLogical(int value);
 
+    Object Rf_ScalarRaw(int value);
+
     Object Rf_ScalarReal(double value);
 
     Object Rf_ScalarString(Object value);
@@ -242,6 +246,12 @@ public interface StdUpCallsRFFI {
     @RFFIRunGC
     Object Rf_allocMatrix(int mode, int nrow, int ncol);
 
+    @RFFIRunGC
+    Object Rf_allocList(int length);
+
+    @RFFIRunGC
+    Object Rf_allocSExp(int type);
+
     int Rf_nrows(Object x);
 
     int Rf_ncols(Object x);

com.oracle.truffle.r.native/fficall/src/common/rffi_upcalls.h

@@ -30,10 +30,12 @@ extern __thread void* *callbacks;
 
 // This is the complete set , including those not yet implemented
 
+typedef SEXP (*call_Rf_ScalarComplex)(double real, double imag);
 typedef SEXP (*call_Rf_ScalarInteger)(int value);
+typedef SEXP (*call_Rf_ScalarLogical)(int value);
+typedef SEXP (*call_Rf_ScalarRaw)(int value);
 typedef SEXP (*call_Rf_ScalarReal)(double value);
 typedef SEXP (*call_Rf_ScalarString)(SEXP value);
-typedef SEXP (*call_Rf_ScalarLogical)(int value);
 typedef SEXP (*call_Rf_allocVector)(SEXPTYPE t, R_xlen_t len);
 typedef SEXP (*call_Rf_allocArray)(SEXPTYPE t, SEXP dims);
 typedef SEXP (*call_Rf_alloc3DArray)(SEXPTYPE t, int x, int y, int z);