X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparse-scm.cc;h=d1dad300e37a0b61169010bf17343f5b687bb7de;hb=38d7d319eabc906e82fb42002678c6d42a23b6f7;hp=255d5c03f994bc7d47e9708c0a297e49c12a524d;hpb=36f85b4de29f035ce18a179943116d3c79002a63;p=lilypond.git diff --git a/lily/parse-scm.cc b/lily/parse-scm.cc index 255d5c03f9..d1dad300e3 100644 --- a/lily/parse-scm.cc +++ b/lily/parse-scm.cc @@ -1,52 +1,69 @@ -#include +/* + parse-scm -- Parse a single SCM expression exactly. + + source file of the GNU LilyPond music typesetter + + (c) 2004--2009 Han-Wen Nienhuys +*/ -#include "ly-module.hh" -#include "lily-guile.hh" #include "parse-scm.hh" -#include "string.hh" + +#include +using namespace std; + +#include "lily-parser.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 */ SCM -internal_ly_parse_scm (Parse_start * ps, bool safe) +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_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); - /* Read expression from port */ - if (!SCM_EOF_OBJECT_P (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)) { - if (safe) + if (ps->safe_) { - static SCM safe_module; - if (!safe_module) + static SCM module = SCM_BOOL_F; + if (module == SCM_BOOL_F) { - safe_module = scm_primitive_eval (ly_symbol2scm ("safe-module")); - if (output_format_global == PAGE_LAYOUT) - ly_import_module (safe_module, scm_c_resolve_module ("lily")); + SCM function = ly_lily_module_constant ("make-safe-lilypond-module"); + module = scm_call_0 (function); } - answer = scm_eval (form, safe_module); + + // 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 = gh_scm2int (to) - gh_scm2int (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. @@ -60,75 +77,57 @@ internal_ly_parse_scm (Parse_start * ps, bool safe) SCM catch_protected_parse_body (void *p) { - Parse_start *ps = (Parse_start*) p; - return internal_ly_parse_scm (ps, false); -} + Parse_start *ps = (Parse_start *) p; -SCM -safe_catch_protected_parse_body (void *p) -{ - Parse_start *ps = (Parse_start*) p; - return internal_ly_parse_scm (ps, true); + return internal_ly_parse_scm (ps); } -SCM -parse_handler (void * data, SCM tag, SCM args) +SCM +parse_handler (void *data, SCM tag, SCM args) { - Parse_start* ps = (Parse_start*) data; + Parse_start *ps = (Parse_start *) data; - 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 (gh_cadr (args), gh_caddr (args), scm_current_error_port ()); + scm_display_error_message (scm_cadr (args), scm_caddr (args), scm_current_error_port ()); + + if (tag == ly_symbol2scm ("read-error")) + ps->nchars = 1; - /* - 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, bool safe) +protected_ly_parse_scm (Parse_start *ps) { - return scm_internal_catch (ly_symbol2scm (READ_ERROR), - (safe ? &safe_catch_protected_parse_body - : catch_protected_parse_body), - (void*)ps, - &parse_handler, (void*)ps); + /* + Catch #t : catch all Scheme level errors. + */ + return scm_internal_catch (SCM_BOOL_T, + &catch_protected_parse_body, + (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. If failure, then 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 ; + 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, safe) - : internal_ly_parse_scm (&ps, safe); + SCM ans = parse_protect_global ? protected_ly_parse_scm (&ps) + : internal_ly_parse_scm (&ps); *n = ps.nchars; - return ans; + return ans; }