[GR-9827] Allow RStringVector to contain CharSXPWrappers or Strings, support for DATAPTR(characterVector).

PullRequest: fastr/1493

Author: steve-s

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

@@ -35,6 +35,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Function;
 
+import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.frame.Frame;
 import com.oracle.truffle.api.frame.FrameInstance.FrameAccess;
@@ -51,6 +52,7 @@
 import com.oracle.truffle.r.runtime.RCleanUp;
 import com.oracle.truffle.r.runtime.REnvVars;
 import com.oracle.truffle.r.runtime.RError;
+import com.oracle.truffle.r.runtime.RError.Message;
 import com.oracle.truffle.r.runtime.RErrorHandling;
 import com.oracle.truffle.r.runtime.RInternalError;
 import com.oracle.truffle.r.runtime.RRuntime;
@@ -2280,6 +2282,15 @@ public Object octsize(Object size) {
         throw implementedAsNode();
     }
 
+    @Override
+    public Object FASTR_DATAPTR(Object x) {
+        if (x instanceof RStringVector) {
+            return VectorRFFIWrapper.get((RStringVector) x);
+        }
+        CompilerDirectives.transferToInterpreter();
+        throw RError.error(RError.NO_CALLER, Message.GENERIC, "DATAPTR not implemented for type " + Utils.getTypeName(x));
+    }
+
     @Override
     public Object INTEGER(Object x) {
         // also handles LOGICAL

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

@@ -22,6 +22,8 @@
  */
 package com.oracle.truffle.r.ffi.impl.upcalls;
 
+import com.oracle.truffle.r.ffi.processor.RFFICpointer;
+
 /**
  * Up-calls specific to FastR used in FastR native code and not exported as part of any API.
  */
@@ -41,4 +43,11 @@ public interface FastRUpCalls {
     boolean isSeekable(Object x);
 
     void restoreHandlerStacks(Object savedHandlerStack);
+
+    /**
+     * Implements {@code DATAPTR} for types that do not have specialized API function for accessing
+     * the underlying data such as {@link com.oracle.truffle.r.runtime.data.RStringVector}.
+     */
+    @RFFICpointer
+    Object FASTR_DATAPTR(Object x);
 }

com.oracle.truffle.r.native/fficall/src/common/Rinternals_common.c

@@ -21,6 +21,7 @@
  * questions.
  */
 #include <Rinternals.h>
+extern void* FASTR_DATAPTR(SEXP x);
 
 // This file includes all implementations that arise from Rinternals.h that
 // are independent, or largely independent, of the RFFI implementation.
@@ -117,13 +118,8 @@ void *DATAPTR(SEXP x) {
 	    return COMPLEX(x);
     } else if (type == CHARSXP) {
         return R_CHAR(x);
-    } else if (type == STRSXP) {
-        printf("FastR does not support DATAPTR macro with character vectors, please use SET_STRING_ELT or STRING_ELT.\n");
-        exit(1);
     } else {
-		printf("DATAPTR macro with SEXPTYPE %d is not supported.\n", type);
-		exit(1);
-		return NULL;
+        return FASTR_DATAPTR(x);
 	}
 }
 

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

@@ -171,6 +171,7 @@ typedef int (*call_LEVELS)(SEXP x);
 typedef int (*call_SETLEVELS)(SEXP x, int v);
 typedef int *(*call_LOGICAL)(SEXP x);
 typedef int *(*call_INTEGER)(SEXP x);
+typedef void *(*call_FASTR_DATAPTR)(SEXP x);
 typedef Rbyte *(*call_RAW)(SEXP x);
 typedef double *(*call_REAL)(SEXP x);
 typedef Rcomplex *(*call_COMPLEX)(SEXP x);