The R Project SVN R

Rev

Rev 87891 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 87891 Rev 87909
Line 174... Line 174...
174
    if (useSrc) {
174
    if (useSrc) {
175
	PROTECT(t = lang2(R_AsCharacterSymbol, t));
175
	PROTECT(t = lang2(R_AsCharacterSymbol, t));
176
	t = eval(t, R_BaseEnv);
176
	t = eval(t, R_BaseEnv);
177
	UNPROTECT(1);
177
	UNPROTECT(1);
178
    } else {
178
    } else {
179
	t = deparse1w(s, 0, data->useSource | DEFAULTDEPARSE);
179
	t = deparse1w(s, false, data->useSource | DEFAULTDEPARSE);
180
	R_print = *data; /* Deparsing calls PrintDefaults() */
180
	R_print = *data; /* Deparsing calls PrintDefaults() */
181
    }
181
    }
182
    PROTECT(t);
182
    PROTECT(t);
183
    for (i = 0; i < LENGTH(t); i++) {
183
    for (i = 0; i < LENGTH(t); i++) {
184
 	Rprintf("%s\n", translateChar(STRING_ELT(t, i))); // translate: for srcref part (PR#16732)
184
 	Rprintf("%s\n", translateChar(STRING_ELT(t, i))); // translate: for srcref part (PR#16732)
Line 771... Line 771...
771
static void PrintExpression(SEXP s, R_PrintData *data)
771
static void PrintExpression(SEXP s, R_PrintData *data)
772
{
772
{
773
    SEXP u;
773
    SEXP u;
774
    int i, n;
774
    int i, n;
775
 
775
 
776
    u = PROTECT(deparse1w(s, 0, data->useSource | DEFAULTDEPARSE));
776
    u = PROTECT(deparse1w(s, false, data->useSource | DEFAULTDEPARSE));
777
    R_print = *data; /* Deparsing calls PrintDefaults() */
777
    R_print = *data; /* Deparsing calls PrintDefaults() */
778
 
778
 
779
    n = LENGTH(u);
779
    n = LENGTH(u);
780
    for (i = 0; i < n; i++)
780
    for (i = 0; i < n; i++)
781
	Rprintf("%s\n", CHAR(STRING_ELT(u, i))); /*translated */
781
	Rprintf("%s\n", CHAR(STRING_ELT(u, i))); /*translated */
Line 802... Line 802...
802
	s2 = R_findVarInFrame(env, install(nm));
802
	s2 = R_findVarInFrame(env, install(nm));
803
    }
803
    }
804
    if(s2 != R_UnboundValue) {
804
    if(s2 != R_UnboundValue) {
805
	SEXP t;
805
	SEXP t;
806
	PROTECT(s2);
806
	PROTECT(s2);
807
	t = deparse1m(s2, 0, DEFAULTDEPARSE); // or deparse1() ?
807
	t = deparse1m(s2, false, DEFAULTDEPARSE); // or deparse1() ?
808
	R_print = *data; /* Deparsing calls PrintDefaults() */
808
	R_print = *data; /* Deparsing calls PrintDefaults() */
809
 
809
 
810
	Rprintf("%s ", CHAR(STRING_ELT(t, 0))); /* translated */
810
	Rprintf("%s ", CHAR(STRING_ELT(t, 0))); /* translated */
811
	Rprintf(".Primitive(\"%s\")\n", PRIMNAME(s));
811
	Rprintf(".Primitive(\"%s\")\n", PRIMNAME(s));
812
	UNPROTECT(1);
812
	UNPROTECT(1);
Line 869... Line 869...
869
    case NILSXP:
869
    case NILSXP:
870
	Rprintf("NULL\n");
870
	Rprintf("NULL\n");
871
	break;
871
	break;
872
    case SYMSXP:
872
    case SYMSXP:
873
	/* Use deparse here to handle backtick quotification of "weird names". */
873
	/* Use deparse here to handle backtick quotification of "weird names". */
874
	t = deparse1(s, 0, SIMPLEDEPARSE); // TODO ? rather deparse1m()
874
	t = deparse1(s, false, SIMPLEDEPARSE); // TODO ? rather deparse1m()
875
	R_print = *data; /* Deparsing calls PrintDefaults() */
875
	R_print = *data; /* Deparsing calls PrintDefaults() */
876
	Rprintf("%s\n", CHAR(STRING_ELT(t, 0))); /* translated */
876
	Rprintf("%s\n", CHAR(STRING_ELT(t, 0))); /* translated */
877
	break;
877
	break;
878
    case SPECIALSXP:
878
    case SPECIALSXP:
879
    case BUILTINSXP:
879
    case BUILTINSXP: