mirrors/ecl
1
Fork 0
mirror of https://gitlab.com/embeddable-common-lisp/ecl.git synced 2026-03-15 09:20:23 -07:00
Code Issues Projects Releases Packages Wiki Activity

The previous improvement for FEreader_error broke the cases in which it is used as FEparser_error (i.e. stream = Cnil).

Browse source
This commit is contained in:
Juan Jose Garcia Ripoll 2009-07-12 23:39:27 +02:00
parent 88498d35f5
commit fb5306016c
1 changed files with 22 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/c/error.d
View file

@ -113,21 +113,32 @@ FEcontrol_error(const char *s, int narg, ...)
void
FEreader_error(const char *s, cl_object stream, int narg, ...)
{
cl_object prefix = make_constant_base_string("Reader error in file ~S, "
"position ~D:~%");
cl_object message = make_constant_base_string(s);
cl_object args_list, position = cl_file_position(1, stream);
cl_object args_list;
cl_va_list args;
cl_va_start(args, narg, narg, 0);
args_list = cl_grab_rest_args(args);
message = si_base_string_concatenate(2, prefix, message);
args_list = cl_listX(3, stream, position, args_list);
si_signal_simple_error(6,
@'reader-error', /* condition name */
Cnil, /* not correctable */
message, /* format control */
args_list, /* format args */
@':stream', stream);
if (Null(stream)) {
/* Parser error */
si_signal_simple_error(4,
@'parse-error', /* condition name */
Cnil, /* not correctable */
message, /* format control */
args_list);
} else {
/* Actual reader error */
cl_object prefix = make_constant_base_string("Reader error in file ~S, "
"position ~D:~%");
cl_object position = cl_file_position(1, stream);
message = si_base_string_concatenate(2, prefix, message);
args_list = cl_listX(3, stream, position, args_list);
si_signal_simple_error(6,
@'reader-error', /* condition name */
Cnil, /* not correctable */
message, /* format control */
args_list, /* format args */
@':stream', stream);
}
}