The R Project SVN – R – Diff – /trunk/src/main/objects.c

 SEXP R_LookupMethod(SEXP method, SEXP rho, SEXP callrho, SEXP defrho)
+{
     SEXP val;
     if (R_UseNamespaceDispatch) {
+	if (TYPEOF(callrho) == NILSXP) {
+	    warning(_("use of NULL environment is deprecated"));
+	    callrho = R_BaseEnv;
+	} else
-	if (TYPEOF(callrho) != ENVSXP && callrho != R_BaseEnv)
+	if (TYPEOF(callrho) != ENVSXP)
 	    error(_("bad generic call environment"));
+	if (TYPEOF(defrho) == NILSXP) {
+	    warning(_("use of NULL environment is deprecated"));
+	    defrho = R_BaseEnv;
+	} else
-	if (TYPEOF(defrho) != ENVSXP && defrho != R_BaseEnv)
+	if (TYPEOF(defrho) != ENVSXP)
 	    error(_("bad generic definition environment"));
 	if (defrho == R_BaseEnv)
 	    defrho = R_BaseNamespace;
 	val = findVar(method, callrho);
        defenv = environment where the generic was defined */
     cptr = R_GlobalContext;
     if ( !(cptr->callflag & CTXT_FUNCTION) || cptr->cloenv != env)
 	error(_("'UseMethod' used in an inappropriate fashion"));
     callenv = cptr->sysparent;
-    defenv = TYPEOF(env) == ENVSXP ? ENCLOS(env) : R_BaseEnv;
+    defenv = ENCLOS(env);
     if (nargs)
 	PROTECT(generic = eval(CAR(args), env));
     else
 	errorcall(call, _("there must be a first argument"));
     SEXP e, value, rho, fun, symbol, dot_Generic;
     RCNTXT *cptr;
     /* find a non-generic function */
     symbol = install(CHAR(asChar(name)));
     dot_Generic = install(".Generic");
-    for(rho = ENCLOS(env); rho != R_BaseEnv && isEnvironment(rho);
+    for(rho = ENCLOS(env); rho != R_EmptyEnv;
 	rho = ENCLOS(rho)) {
 	fun = findVarInFrame3(rho, symbol, TRUE);
 	if(fun == R_UnboundValue) continue;
 	switch(TYPEOF(fun)) {
 	case CLOSXP:

The R Project SVN R

(root)/trunk/src/main/objects.c – Rev 35450 → 36174