The R Project SVN R

Rev

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

Rev 63171 Rev 63223
Line 72... Line 72...
72 
    checkArity(op, args);
 72 
    checkArity(op, args);
73 
 
 73 
 
74 
    if (!isString(CAR(args)) || length(CAR(args)) == 0)
 74 
    if (!isString(CAR(args)) || length(CAR(args)) == 0)
75 
	error(_("invalid first argument"));
 75 
	error(_("invalid first argument"));
76 
    else
 76 
    else
77 
	name = install(translateChar(STRING_ELT(CAR(args), 0)));
 77 
	name = installTrChar(STRING_ELT(CAR(args), 0));
78 
    args = CDR(args);
 78 
    args = CDR(args);
79 
    expr = CAR(args);
 79 
    expr = CAR(args);
80 
 
 80 
 
81 
    args = CDR(args);
 81 
    args = CDR(args);
82 
    eenv = CAR(args);
 82 
    eenv = CAR(args);
Line 187... Line 187...
187 
{
 187 
{
188 
    SEXP s;
 188 
    SEXP s;
189 
 
 189 
 
190 
    checkArity(op,args);
 190 
    checkArity(op,args);
191 
    if (TYPEOF(CAR(args)) == STRSXP && length(CAR(args))==1) {
 191 
    if (TYPEOF(CAR(args)) == STRSXP && length(CAR(args))==1) {
192 
	PROTECT(s = install(translateChar(STRING_ELT(CAR(args), 0))));
 192 
	PROTECT(s = installTrChar(STRING_ELT(CAR(args), 0)));
193 
	SETCAR(args, findFun(s, rho));
 193 
	SETCAR(args, findFun(s, rho));
194 
	UNPROTECT(1);
 194 
	UNPROTECT(1);
195 
    }
 195 
    }
196 
 
 196 
 
197 
    if (TYPEOF(CAR(args)) == CLOSXP) {
 197 
    if (TYPEOF(CAR(args)) == CLOSXP) {