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

+}
 SEXP do_isloaded(SEXP call, SEXP op, SEXP args, SEXP env)
+{
     SEXP ans;
-    char *sym, *pkg;
+    char *sym, *pkg= "";
-    int val;
+    int val = 1, nargs = length(args);
+    if (nargs < 1) errorcall(call, "no arguments supplied");
-    checkArity(op, args);
+    if (nargs > 2) errorcall(call, "too many arguments");
     if(!isValidString(CAR(args)))
 	errorcall(call, R_MSG_IA);
     sym = CHAR(STRING_ELT(CAR(args), 0));
+    if(nargs == 2) {
-    if(!isValidString(CADR(args)))
+	if(!isValidString(CADR(args)))
-	errorcall(call, R_MSG_IA);
+	    errorcall(call, R_MSG_IA);
-    pkg = CHAR(STRING_ELT(CADR(args), 0));
+	pkg = CHAR(STRING_ELT(CADR(args), 0));
-    val = 1;
+    }
-    if (!(R_FindSymbol(sym, pkg, NULL)))
+    if (!(R_FindSymbol(sym, pkg, NULL))) val = 0;
-	val = 0;
     ans = allocVector(LGLSXP, 1);
     LOGICAL(ans)[0] = val;
     return ans;
+}
 SEXP do_External(SEXP call, SEXP op, SEXP args, SEXP env)
+{
     DL_FUNC fun;
     SEXP retval;
-    R_RegisteredNativeSymbol symbol = {R_EXTERNAL_SYM, NULL};
+    R_RegisteredNativeSymbol symbol = {R_EXTERNAL_SYM, {NULL}};
     /* I don't like this messing with vmax <TSL> */
     /* But it is needed for clearing R_alloc and to be like .Call <BDR>*/
     char *vmax = vmaxget();
     op = CAR(args);
 /* .Call(name, <args>) */
 SEXP do_dotcall(SEXP call, SEXP op, SEXP args, SEXP env)
+{
     DL_FUNC fun;
     SEXP retval, cargs[MAX_ARGS], pargs;
-    R_RegisteredNativeSymbol symbol = {R_CALL_SYM, NULL};
+    R_RegisteredNativeSymbol symbol = {R_CALL_SYM, {NULL}};
     int nargs;
     char *vmax = vmaxget();
     op = CAR(args);
     if (!isValidString(op))
 	errorcall(call, "function name must be a string (of length 1)");
     void **cargs;
     int dup, havenames, naok, nargs, which;
     DL_FUNC fun;
     SEXP ans, pargs, s;
     R_toCConverter  *argConverters[65];
-    R_RegisteredNativeSymbol symbol = {R_C_SYM, NULL};
+    R_RegisteredNativeSymbol symbol = {R_C_SYM, {NULL}};
     char buf[128], *p, *q, *vmax;
     if (NaokSymbol == NULL || DupSymbol == NULL || PkgSymbol == NULL) {
 	NaokSymbol = install("NAOK");
 	DupSymbol = install("DUP");

The R Project SVN R

(root)/branches/R-NaString/src/main/dotcode.c @ 77458 – Rev 14571 → 14577