X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparse-scm.cc;h=9f6ff8b5d785762ba255c07817745fd89fcb2057;hb=77706635f33adff837dc7af0482f51ff3f0f5cb1;hp=f40d10abbab8fa3cc3ec6dfa53378e4e4926f395;hpb=7c1ee9ae5133a32f00fe0d2f59b1a6e84baa0bed;p=lilypond.git diff --git a/lily/parse-scm.cc b/lily/parse-scm.cc index f40d10abba..9f6ff8b5d7 100644 --- a/lily/parse-scm.cc +++ b/lily/parse-scm.cc @@ -1,39 +1,60 @@ /* - parse-scm -- + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 2004--2010 Han-Wen Nienhuys - (c) 2004 Han-Wen Nienhuys + 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. + + 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. + + 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 "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) +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 (); - - scm_seek (port, scm_long2num (off), scm_long2num (SEEK_SET)); + int off = ps->start_location_.start () - sf->c_str (); + + scm_seek (port, scm_from_long (off), scm_from_long (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); + + 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_read (port))) + if (!SCM_EOF_OBJECT_P (form)) { if (ps->safe_) { @@ -43,17 +64,17 @@ internal_ly_parse_scm (Parse_start * ps) 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. @@ -67,68 +88,57 @@ internal_ly_parse_scm (Parse_start * ps) 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; - (void) tag; - - ps->start_location_.error (_("GUILE signaled an error for the expression beginning here")); + Parse_start *ps = (Parse_start *) data; + + 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; } -/* - 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 */ 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); *n = ps.nchars; - return ans; + return ans; }