source file of the GNU LilyPond music typesetter
- (c) 2004--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 2004--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "parse-scm.hh"
#include <cstdio>
using namespace std;
+#include "lily-parser.hh"
#include "international.hh"
#include "main.hh"
#include "paper-book.hh"
SCM answer = SCM_UNSPECIFIED;
SCM form = scm_read (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))
{
SCM function = ly_lily_module_constant ("make-safe-lilypond-module");
module = scm_call_0 (function);
}
+
+ // We define the parser so trusted Scheme functions can
+ // access the real namespace underlying the parser.
+ if (ps->parser_)
+ scm_module_define (module, ly_symbol2scm ("parser"),
+ ps->parser_->self_scm());
answer = scm_eval (form, module);
}
else
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;
}
/* Try parsing. Upon failure return SCM_UNDEFINED.
FIXME: shouldn't we return SCM_UNSCPECIFIED -- jcn */
SCM
-ly_parse_scm (char const *s, int *n, Input i, bool safe)
+ly_parse_scm (char const *s, int *n, Input i, bool safe, Lily_parser *parser)
{
Parse_start ps;
ps.str = s;
ps.start_location_ = i;
ps.safe_ = safe;
+ ps.parser_ = parser;
SCM ans = parse_protect_global ? protected_ly_parse_scm (&ps)
: internal_ly_parse_scm (&ps);