/*
- parse-scm --
+ parse-scm -- Parse a single SCM expression exactly.
source file of the GNU LilyPond music typesetter
- (c) 2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#include "parse-scm.hh"
#include <cstdio>
+using namespace std;
-#include "ly-module.hh"
+#include "international.hh"
#include "main.hh"
#include "paper-book.hh"
#include "source-file.hh"
/* Pass string to scm parser, evaluate one expression.
Return result value and #chars read.
-
+
Thanks to Gary Houston <ghouston@freewire.co.uk> */
SCM
-internal_ly_parse_scm (Parse_start * ps)
+internal_ly_parse_scm (Parse_start *ps)
{
- Source_file *sf = ps->start_location_.source_file_;
+ Source_file *sf = ps->start_location_.get_source_file ();
SCM port = sf->get_port ();
- int off = ps->start_location_.defined_str0_ - sf->to_str0 ();
-
+ int off = ps->start_location_.start () - sf->c_str ();
+
scm_seek (port, scm_long2num (off), scm_long2num (SEEK_SET));
SCM from = scm_ftell (port);
- SCM form;
SCM answer = SCM_UNSPECIFIED;
+ SCM form = scm_read (port);
/* Read expression from port. */
- if (!SCM_EOF_OBJECT_P (form = scm_read (port)))
+ if (!SCM_EOF_OBJECT_P (form))
{
if (ps->safe_)
{
static SCM module = SCM_BOOL_F;
if (module == SCM_BOOL_F)
{
- SCM function = ly_scheme_function ("make-safe-lilypond-module");
+ SCM function = ly_lily_module_constant ("make-safe-lilypond-module");
module = scm_call_0 (function);
}
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
catch_protected_parse_body (void *p)
{
- Parse_start *ps = (Parse_start*) p;
-
+ Parse_start *ps = (Parse_start *) p;
+
return internal_ly_parse_scm (ps);
}
-SCM
+SCM
parse_handler (void *data, SCM tag, SCM args)
{
- Parse_start* ps = (Parse_start *) data;
+ Parse_start *ps = (Parse_start *) data;
(void) tag;
-
- ps->start_location_.error (_("GUILE signaled an error for the expression beginning here"));
+
+ 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;
-
+
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);
+ (void *) ps,
+ &parse_handler, (void *) ps);
}
-bool parse_protect_global = true;
+bool parse_protect_global = true;
+bool parsed_objects_should_be_dead = false;
/* Try parsing. Upon failure return SCM_UNDEFINED.
FIXME: shouldn't we return SCM_UNSCPECIFIED -- jcn */
ps.str = s;
ps.start_location_ = i;
ps.safe_ = safe;
-
+
SCM ans = parse_protect_global ? protected_ly_parse_scm (&ps)
: internal_ly_parse_scm (&ps);
*n = ps.nchars;
- return ans;
+ return ans;
}