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

 	    long *lengths, char **names, long nres, char **results)
+{
     SEXP call, pcall, s;
     SEXPTYPE type;
     int i, j, n;
+    char **cptr;
     if (!isFunction((SEXP)func))
 	error("invalid function in call_R");
     if (nargs < 0)
 	error("invalid argument count in call_R");
     if (nres < 0)
 	    LENGTH(CAR(pcall)) = lengths[i];
 	    break;
 	case STRSXP:
 	    n = lengths[i];
 	    CAR(pcall) = allocVector(STRSXP, n);
-	    for (j = 0 ; j < n ; j++) {
-		s = allocSExp(CHARSXP);
-		CHAR(s) = (char*)(arguments[i]);
+	    cptr = (char**)arguments[i];
-		LENGTH(s) = strlen(CHAR(s));
+ 	    for (j = 0 ; j < n ; j++) {
-		STRING(CAR(pcall))[i] = s;
+		STRING(CAR(pcall))[j] = mkChar(cptr[j]);
-	    }
+ 	    }
+	    LENGTH(CAR(pcall)) = n;
 	    break;
 	    /* FIXME : This copy is unnecessary! */
+	    /* FIXME : This is obviously incorrect so disable
 	case VECSXP:
 	    n = lengths[i];
 	    CAR(pcall) = allocVector(VECSXP, n);
 	    for (j = 0 ; j < n ; j++) {
 		VECTOR(s)[i] = (SEXP)(arguments[i]);
+	    }
-	    break;
+	    break; */
+	default:
+	    error("Mode `%s' is not supported in call_R", modes[i]);
+	}
 	if(names && names[i])
 	    TAG(pcall) = install(names[i]);
 	NAMED(CAR(pcall)) = 2;
+    }

The R Project SVN R