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

 	} else if(TAG(s) == DupSymbol) {
 	    *dup = asLogical(CAR(s));
 	    /* SETCDR(prev, s = CDR(s)); */
 	    if(dupused++ == 1) warning("DUP used more than once");
 	} else if(TAG(s) == PkgSymbol) {
-	    if(pkgused++ == 1) warning("PACKAGE used more than once");
 	    strcpy(DLLname, CHAR(STRING_ELT(CAR(s), 0)));
+	    if(pkgused++ > 1) warning("PACKAGE used more than once");
+	    /* More generally, this should allow us to process
+               any additional arguments and not insist that PACKAGE
+               be the last argument.
+             */
-            if(s == args)
+             if(s == args)
-		args = CDR(s);
+		 args = s = CDR(s);
-            else
+             else
-	        SETCDR(prev, s = CDR(s)); /* delete this arg, which is the next one */
+		 SETCDR(prev, s = CDR(s));
-            continue;
+             continue;
-	} else {
 	}
         nargs++;
 	prev = s;
 	s = CDR(s);
+    }
     *len = nargs;
     /* Convert the arguments for use in foreign */
     /* function calls.  Note that we copy twice */
     /* once here, on the way into the call, and */
     /* once below on the way out. */
     cargs = (void**)R_alloc(nargs, sizeof(void*));
     nargs = 0;
     for(pargs = args ; pargs != R_NilValue; pargs = CDR(pargs)) {
 	cargs[nargs] = RObjToCPtr(CAR(pargs), naok, dup, nargs + 1, which, buf, argConverters + nargs);
 	nargs++;

The R Project SVN R