The R Project SVN R

Rev

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

Rev 52487 Rev 52834
Line 244... Line 244...
244
	    known_to_be_latin1 = old_latin1;
244
	    known_to_be_latin1 = old_latin1;
245
	    known_to_be_utf8 = old_utf8;
245
	    known_to_be_utf8 = old_utf8;
246
	}
246
	}
247
	if (num == NA_INTEGER) num = -1;
247
	if (num == NA_INTEGER) num = -1;
248
	s = R_ParseVector(text, num, &status, source);
248
	s = R_ParseVector(text, num, &status, source);
249
	if (status != PARSE_OK) parseError(call, 0);
249
	if (status != PARSE_OK) parseError(call, R_ParseError);
250
    }
250
    }
251
    else if (ifile >= 3) {/* file != "" */
251
    else if (ifile >= 3) {/* file != "" */
252
	if (num == NA_INTEGER) num = -1;
252
	if (num == NA_INTEGER) num = -1;
253
	if(!wasopen) {
253
	if(!wasopen) {
254
	    if(!con->open(con)) error(_("cannot open the connection"));
254
	    if(!con->open(con)) error(_("cannot open the connection"));
Line 263... Line 263...
263
	if (status != PARSE_OK) parseError(call, R_ParseError);
263
	if (status != PARSE_OK) parseError(call, R_ParseError);
264
    }
264
    }
265
    else {
265
    else {
266
	if (num == NA_INTEGER) num = 1;
266
	if (num == NA_INTEGER) num = 1;
267
	s = R_ParseBuffer(&R_ConsoleIob, num, &status, prompt, source);
267
	s = R_ParseBuffer(&R_ConsoleIob, num, &status, prompt, source);
268
	if (status != PARSE_OK) parseError(call, 0);
268
	if (status != PARSE_OK) parseError(call, R_ParseError);
269
    }
269
    }
270
    UNPROTECT(2);
270
    UNPROTECT(2);
271
    known_to_be_latin1 = old_latin1;
271
    known_to_be_latin1 = old_latin1;
272
    known_to_be_utf8 = old_utf8;
272
    known_to_be_utf8 = old_utf8;
273
    return s;
273
    return s;