The R Project SVN – R – Diff – /branches/R-gcontext/src/main/dotcode.c

 /* Convert an R object to a non-moveable C/Fortran object and return
    a pointer to it.  This leaves pointers for anything other
    than vectors and lists unaltered.
 */
+static Rboolean
+checkNativeType(int targetType, int actualType)
+{
+   if(targetType > 0) {
+      if(targetType == INTSXP || targetType == LGLSXP) {
+	  return(actualType == INTSXP || actualType == LGLSXP);
+      }
+      return(targetType == actualType);
+   }
+  return(TRUE);
+}
 static void *RObjToCPtr(SEXP s, int naok, int dup, int narg, int Fort, const char *name, R_toCConverter **converter,
                           int targetType)
+{
     int *iptr;
     float *sptr;
 	ans = Rf_convertToC(s, &info, &success, converter);
 	if(success)
 	    return(ans);
+    }
-    if(targetType > 0 && targetType != TYPEOF(s)) {
+    if(checkNativeType(targetType, TYPEOF(s)) == FALSE) {
      if(!dup) {
-       error("expliciti request not to duplicate arguments in call to %s, but argument %d is of the wrong type",
+       error("explicit request not to duplicate arguments in call to %s, but argument %d is of the wrong type (%d != %d)",
-	     name, narg + 1);
+	     name, narg + 1, targetType, TYPEOF(s));
+     }
      if(targetType != SINGLESXP)
         s = coerceVector(s, targetType);
+    }
 #ifdef THROW_REGISTRATION_TYPE_ERROR
 static Rboolean
 comparePrimitiveTypes(R_NativePrimitiveArgType type, SEXP s, Rboolean dup)
+{
-   if(TYPEOF(s) == type)
+   if(type == ANYSXP || TYPEOF(s) == type)
       return(TRUE);
    if(dup && type == SINGLESXP)
       return(asLogical(getAttrib(s, install("Csingle"))) == TRUE);
     q = buf;
     while ((*q = *p) != '\0') {
 	p++;
 	q++;
+    }
-#ifdef HAVE_F77_UNDERSCORE
-    if (which)
-	*q++ = '_';
-    *q = '\0';
-#endif
 #ifdef Macintosh
     if (!(fun = R_FindSymbol(buf, "", &symbol)))
 #else
     if (!(fun = R_FindSymbol(buf, DLLname, &symbol)))
 #endif /* Macintosh */

The R Project SVN R

(root)/branches/R-gcontext/src/main/dotcode.c @ 28362 – Rev 20110 → 22284