The R Project SVN R

Rev

Rev 31685 | Rev 32014 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 31685 Rev 31908
Line 914... Line 914...
914 
    for(rho = ENCLOS(env); rho != R_NilValue && isEnvironment(rho);
 914 
    for(rho = ENCLOS(env); rho != R_NilValue && isEnvironment(rho);
915 
	rho = ENCLOS(rho)) {
 915 
	rho = ENCLOS(rho)) {
916 
	fun = findVarInFrame3(rho, symbol, TRUE);
 916 
	fun = findVarInFrame3(rho, symbol, TRUE);
917 
	if(fun == R_UnboundValue) continue;
 917 
	if(fun == R_UnboundValue) continue;
918 
	switch(TYPEOF(fun)) {
 918 
	switch(TYPEOF(fun)) {
919 
	case BUILTINSXP:  case SPECIALSXP: break;
 - 
 
920 
	case CLOSXP:
 919 
	case CLOSXP:
921 
	    value = findVarInFrame3(CLOENV(fun), dot_Generic, TRUE);
 920 
	    value = findVarInFrame3(CLOENV(fun), dot_Generic, TRUE);
922 
	    if(value == R_UnboundValue) break;
 921 
	    if(value == R_UnboundValue) break;
- 
 
 922 
	case BUILTINSXP:  case SPECIALSXP:
- 
 
 923 
	default:
923 
	    /*in all other cases, go on to the parent environment */
 924 
	    /* in all other cases, go on to the parent environment */
- 
 
 925 
	    break;
924 
	}
 926 
	}
925 
	fun = R_UnboundValue;
 927 
	fun = R_UnboundValue;
926 
    }
 928 
    }
927 
    fun = SYMVALUE(symbol);
 929 
    fun = SYMVALUE(symbol);
928 
    if(fun == R_UnboundValue)
 930 
    if(fun == R_UnboundValue)