X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparse-scm.cc;h=576591dc97265e2a77dd93bcfa7c61b7ee48ecba;hb=9a25c725c54c0e2f20441cf365708d0a3b577ff7;hp=d5628707e67b4ffbe16ec36096a20b315f2e60b2;hpb=c2ec642ce42fcf1bbb72bcf9b79b28fe8fa19f0b;p=lilypond.git diff --git a/lily/parse-scm.cc b/lily/parse-scm.cc index d5628707e6..576591dc97 100644 --- a/lily/parse-scm.cc +++ b/lily/parse-scm.cc @@ -1,49 +1,82 @@ -#include +/* + This file is part of LilyPond, the GNU music typesetter. -#include "lily-guile.hh" -#include "parse-scm.hh" -#include "string.hh" -#include "source-file.hh" + Copyright (C) 2004--2015 Han-Wen Nienhuys -/* - Pass string to scm parser, evaluate one expression. - Return result value and #chars read. + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - Thanks to Gary Houston + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - Need guile-1.3.4 (>1.3 anyway) for ftell on str ports -- jcn + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ + +#include "parse-scm.hh" + +#include +using namespace std; + +#include "lily-parser.hh" +#include "lily-lexer.hh" +#include "international.hh" +#include "main.hh" +#include "paper-book.hh" +#include "source-file.hh" +#include "lily-imports.hh" + +/* Pass string to scm parser, read 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_; - SCM port = sf->get_port(); + Input &hi = ps->location_; + Source_file *sf = hi.get_source_file (); + SCM port = sf->get_port (); - int off = ps->start_location_.defined_str0_ - sf->to_str0(); - - scm_seek (port, scm_long2num (off), scm_long2num (SEEK_SET)); + long off = hi.start () - sf->c_str (); + + scm_seek (port, scm_from_long (off), scm_from_long (SEEK_SET)); SCM from = scm_ftell (port); - SCM form; - SCM answer = SCM_UNSPECIFIED; + scm_set_port_line_x (port, scm_from_int (hi.line_number () - 1)); + scm_set_port_column_x (port, scm_from_int (hi.column_number () - 1)); + + bool multiple = ly_is_equal (scm_peek_char (port), SCM_MAKE_CHAR ('@')); + + if (multiple) + (void) scm_read_char (port); + + SCM form = scm_read (port); + SCM to = scm_ftell (port); + + hi.set (hi.get_source_file (), + hi.start (), + hi.start () + scm_to_int (scm_difference (to, from))); - /* Read expression from port */ - if (!SCM_EOF_OBJECT_P (form = scm_read (port))) + if (!SCM_EOF_OBJECT_P (form)) { - if (safe) - { - SCM safe_module = scm_primitive_eval (ly_symbol2scm ("safe-module")); - answer = scm_eval (form, safe_module); - } - else - answer = scm_primitive_eval (form); + if (ps->parser_->lexer_->top_input ()) + { + // Find any precompiled form. + SCM c = scm_assv_ref (ps->parser_->closures_, from); + if (scm_is_true (c)) + // Replace form with a call to previously compiled closure + form = scm_list_1 (c); + } + if (multiple) + form = scm_list_3 (ly_symbol2scm ("apply"), + ly_symbol2scm ("values"), + form); + return 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. @@ -51,81 +84,102 @@ internal_ly_parse_scm (Parse_start * ps, bool safe) early. */ // scm_close_port (port); - return answer; + return SCM_UNDEFINED; +} + +SCM +internal_ly_eval_scm (Parse_start *ps) +{ + if (ps->safe_) + { + static SCM module = SCM_BOOL_F; + if (scm_is_false (module)) + { + module = scm_gc_protect_object (Lily::make_safe_lilypond_module ()); + } + + return scm_eval (ps->form_, module); + } + return scm_primitive_eval (ps->form_); } SCM catch_protected_parse_body (void *p) { - Parse_start *ps = (Parse_start*) p; - return internal_ly_parse_scm (ps, false); + return internal_ly_parse_scm (static_cast (p)); } SCM -safe_catch_protected_parse_body (void *p) +catch_protected_eval_body (void *p) { - Parse_start *ps = (Parse_start*) p; - return internal_ly_parse_scm (ps, true); + return internal_ly_eval_scm (static_cast (p)); } -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->location_.non_fatal_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 ()); + return SCM_UNDEFINED; +} + +SCM +protected_ly_parse_scm (Parse_start *ps) +{ /* - The following is a kludge; we should probably search for - [a-z][0-9] (a note), and start before that. + Catch #t : catch all Scheme level errors. */ - ps->nchars = 1; - - return SCM_UNDEFINED; + return scm_internal_catch (SCM_BOOL_T, + catch_protected_parse_body, + (void *) ps, + &parse_handler, (void *) ps); } -/* - Do some magical incantations: if not, lily will exit on the first - GUILE error, leaving no location trace. - */ +SCM +protected_ly_eval_scm (void *ps) +{ + /* + Catch #t : catch all Scheme level errors. + */ + return scm_internal_catch (SCM_BOOL_T, + catch_protected_eval_body, + ps, + &parse_handler, ps); +} +bool parse_protect_global = true; +bool parsed_objects_should_be_dead = false; -#if GUILE_MINOR_VERSION < 7 - #define READ_ERROR "misc-error" - #else - #define READ_ERROR "read-error" -#endif +/* Try parsing. Upon failure return SCM_UNDEFINED. */ SCM -protected_ly_parse_scm (Parse_start *ps, bool safe) +ly_parse_scm (Input &i, bool safe, Lily_parser *parser) { - return scm_internal_catch (ly_symbol2scm (READ_ERROR), - (safe ? &safe_catch_protected_parse_body - : catch_protected_parse_body), - (void*)ps, - &parse_handler, (void*)ps); -} + Parse_start ps (SCM_UNDEFINED, i, safe, parser); -bool parse_protect_global = true; + SCM ans = parse_protect_global ? protected_ly_parse_scm (&ps) + : internal_ly_parse_scm (&ps); + + return ans; +} -/* - Try parsing. If failure, then return SCM_UNDEFINED. - */ SCM -ly_parse_scm (char const* s, int *n, Input i, bool safe) +ly_eval_scm (SCM form, Input i, bool safe, Lily_parser *parser) { - - Parse_start ps ; - ps.str = s; - ps.start_location_ = i; + Parse_start ps (form, i, safe, parser); - SCM ans = parse_protect_global ? protected_ly_parse_scm (&ps, safe) - : internal_ly_parse_scm (&ps, safe); - *n = ps.nchars; + SCM ans = scm_c_with_fluid + (Lily::f_location, + i.smobbed_copy (), + parse_protect_global ? protected_ly_eval_scm + : catch_protected_eval_body, (void *) &ps); - return ans; + scm_remember_upto_here_1 (form); + return ans; } -