source file of the GNU LilyPond music typesetter
- (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 2004--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "parse-scm.hh"
scm_seek (port, scm_long2num (off), scm_long2num (SEEK_SET));
SCM from = scm_ftell (port);
+ scm_set_port_line_x (port, scm_from_int (ps->start_location_.line_number () -1));
+ scm_set_port_column_x (port, scm_from_int (ps->start_location_.column_number () -1));
+
SCM answer = SCM_UNSPECIFIED;
SCM form = scm_read (port);
+
+ /* Reset read_buf for scm_ftell.
+ Shouldn't scm_read () do this for us? */
+ scm_fill_input (port);
+ SCM to = scm_ftell (port);
+ ps->nchars = scm_to_int (to) - scm_to_int (from);
+
+
/* Read expression from port. */
if (!SCM_EOF_OBJECT_P (form))
{
answer = scm_primitive_eval (form);
}
- /* Reset read_buf for scm_ftell.
- Shouldn't scm_read () do this for us? */
- scm_fill_input (port);
- SCM to = scm_ftell (port);
- ps->nchars = scm_to_int (to) - scm_to_int (from);
-
/* Don't close the port here; if we re-enter this function via a
continuation, then the next time we enter it, we'll get an error.
It's a string port anyway, so there's no advantage to closing it
parse_handler (void *data, SCM tag, SCM args)
{
Parse_start *ps = (Parse_start *) data;
- (void) tag;
ps->start_location_.error (_ ("GUILE signaled an error for the expression beginning here"));
if (scm_ilength (args) > 2)
scm_display_error_message (scm_cadr (args), scm_caddr (args), scm_current_error_port ());
- /*
- The following is a kludge; we should probably search for
- [a-z][0-9] (a note), and start before that.
- */
- ps->nchars = 1;
+ if (tag == ly_symbol2scm ("read-error"))
+ ps->nchars = 1;
return SCM_UNDEFINED;
}
-/*
- Do some magical incantations: if not, lily will exit on the first
- GUILE error, leaving no location trace.
-*/
-
-#if GUILE_MINOR_VERSION < 7
-#define READ_ERROR "misc-error"
-#else
-#define READ_ERROR "read-error"
-#endif
-
SCM
protected_ly_parse_scm (Parse_start *ps)
{
- return scm_internal_catch (ly_symbol2scm (READ_ERROR),
+ /*
+ Catch #t : catch all Scheme level errors.
+ */
+ return scm_internal_catch (SCM_BOOL_T,
&catch_protected_parse_body,
(void *) ps,
&parse_handler, (void *) ps);