X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparse-scm.cc;h=087d2e5951e09940c5aa9fecd947c0111ed6911e;hb=969f01691fb3a5a23320f0ae3a0550559aa98c76;hp=5780e7360edd338ee712f62206c5e17a2a73fcc0;hpb=899a5926b98860f3d5db399616d9211927fbfa3c;p=lilypond.git diff --git a/lily/parse-scm.cc b/lily/parse-scm.cc index 5780e7360e..087d2e5951 100644 --- a/lily/parse-scm.cc +++ b/lily/parse-scm.cc @@ -1,140 +1,136 @@ -#include +/* + parse-scm -- Parse a single SCM expression exactly. + + source file of the GNU LilyPond music typesetter + + (c) 2004--2007 Han-Wen Nienhuys +*/ -#include "lily-guile.hh" #include "parse-scm.hh" -#include "string.hh" -#include "source-file.hh" -/* - Pass string to scm parser, evaluate one expression. - Return result value and #chars read. +#include +using namespace std; - Thanks to Gary Houston +#include "lily-parser.hh" +#include "international.hh" +#include "main.hh" +#include "paper-book.hh" +#include "source-file.hh" - Need guile-1.3.4 (>1.3 anyway) for ftell on str ports -- jcn -*/ +/* 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) +internal_ly_parse_scm (Parse_start *ps) { - Source_file* sf =ps->start_location_.source_file_; - SCM port = sf->get_port(); + Source_file *sf = ps->start_location_.get_source_file (); + SCM port = sf->get_port (); + + int off = ps->start_location_.start () - sf->c_str (); - int off = ps->start_location_.defined_str0_ - sf->to_str0(); - 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))) - answer = scm_primitive_eval (form); - - /* - After parsing - - (begin (foo 1 2)) - - all seems fine, but after parsing - - (foo 1 2) - - read_buf has been advanced to read_pos - 1, - so that scm_ftell returns 1, instead of #parsed chars - */ - - /* - urg: reset read_buf for scm_ftell - shouldn't scm_read () do this for us? - */ + /* 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); + ps->nchars = scm_to_int (to) - scm_to_int (from); + + + /* Read expression from port. */ + if (!SCM_EOF_OBJECT_P (form)) + { + if (ps->safe_) + { + static SCM module = SCM_BOOL_F; + if (module == SCM_BOOL_F) + { + 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); + } /* 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 - early. - - scm_close_port (port); - */ + early. */ + // scm_close_port (port); return answer; } - 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 -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 begining 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()); - - /* - 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_EOL; -} - -/* - Do some magical incantations: if not, lily will exit on the first - GUILE error, leaving no location trace. - */ + scm_display_error_message (scm_cadr (args), scm_caddr (args), scm_current_error_port ()); + if (tag == ly_symbol2scm ("read-error")) + ps->nchars = 1; -#if GUILE_MINOR_VERSION < 7 - #define READ_ERROR "misc-error" - #else - #define READ_ERROR "read-error" -#endif + return SCM_UNDEFINED; +} 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 parsed_objects_should_be_dead = false; -static bool protect = true; - -LY_DEFINE(set_parse_protect, "ly:set-parse-protect", - 1,0,0, (SCM t), - "If protection is switched on, errors in inline scheme are caught. -If off, GUILE will halt on errors, and give a stack trace. Default is protected evaluation.") -{ - protect = (t == SCM_BOOL_T); - return SCM_UNSPECIFIED; -} - +/* 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) +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 = protect ? protected_ly_parse_scm (&ps) + SCM ans = parse_protect_global ? protected_ly_parse_scm (&ps) : internal_ly_parse_scm (&ps); *n = ps.nchars; - return ans; + + return ans; }