The R Project SVN R

Rev

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

Rev 62662 Rev 62883
Line 1973... Line 1973...
1973 
    t = s;
 1973 
    t = s;
1974 
    for (j = 0; j < len; j++, t = CDR(t)) {
 1974 
    for (j = 0; j < len; j++, t = CDR(t)) {
1975 
	SET_TAG(t, install(CHAR(STRING_ELT(CAR(args), j))));
 1975 
	SET_TAG(t, install(CHAR(STRING_ELT(CAR(args), j))));
1976 
	tmp = findVar(TAG(t), source);
 1976 
	tmp = findVar(TAG(t), source);
1977 
	if (tmp == R_UnboundValue)
 1977 
	if (tmp == R_UnboundValue)
1978 
	    error(_("object '%s' not found"), CHAR(PRINTNAME(TAG(t))));
 1978 
	    error(_("object '%s' not found"), EncodeChar(PRINTNAME(TAG(t))));
1979 
	if(ep && TYPEOF(tmp) == PROMSXP) {
 1979 
	if(ep && TYPEOF(tmp) == PROMSXP) {
1980 
	    PROTECT(tmp);
 1980 
	    PROTECT(tmp);
1981 
	    tmp = eval(tmp, source);
 1981 
	    tmp = eval(tmp, source);
1982 
	    UNPROTECT(1);
 1982 
	    UNPROTECT(1);
1983 
	}
 1983 
	}
Line 2304... Line 2304...
2304 
    for (j = 0; j < len; j++, t = CDR(t)) {
 2304 
    for (j = 0; j < len; j++, t = CDR(t)) {
2305 
	SET_TAG(t, install(CHAR(STRING_ELT(list, j))));
 2305 
	SET_TAG(t, install(CHAR(STRING_ELT(list, j))));
2306 
	SETCAR(t, findVar(TAG(t), source));
 2306 
	SETCAR(t, findVar(TAG(t), source));
2307 
	tmp = findVar(TAG(t), source);
 2307 
	tmp = findVar(TAG(t), source);
2308 
	if (tmp == R_UnboundValue)
 2308 
	if (tmp == R_UnboundValue)
2309 
	    error(_("object '%s' not found"), CHAR(PRINTNAME(TAG(t))));
 2309 
	    error(_("object '%s' not found"), EncodeChar(PRINTNAME(TAG(t))));
2310 
	if(ep && TYPEOF(tmp) == PROMSXP) {
 2310 
	if(ep && TYPEOF(tmp) == PROMSXP) {
2311 
	    PROTECT(tmp);
 2311 
	    PROTECT(tmp);
2312 
	    tmp = eval(tmp, source);
 2312 
	    tmp = eval(tmp, source);
2313 
	    UNPROTECT(1);
 2313 
	    UNPROTECT(1);
2314 
	}
 2314 
	}