X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparse-scm.cc;h=7fea6f7d2c390e68f5d72585afeb6d42d578e7fe;hb=3f7f9c0f2bee228e6817283ed816973772477c6b;hp=f55be9829d81635f017a5bddaefdc3aa1996ec16;hpb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;p=lilypond.git diff --git a/lily/parse-scm.cc b/lily/parse-scm.cc index f55be9829d..7fea6f7d2c 100644 --- a/lily/parse-scm.cc +++ b/lily/parse-scm.cc @@ -1,9 +1,20 @@ /* - parse-scm -- Parse a single SCM expression exactly. + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter + Copyright (C) 2004--2011 Han-Wen Nienhuys - (c) 2004--2008 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" @@ -17,7 +28,7 @@ using namespace std; #include "paper-book.hh" #include "source-file.hh" -/* Pass string to scm parser, evaluate one expression. +/* Pass string to scm parser, read one expression. Return result value and #chars read. Thanks to Gary Houston */ @@ -29,44 +40,16 @@ internal_ly_parse_scm (Parse_start *ps) int off = ps->start_location_.start () - sf->c_str (); - scm_seek (port, scm_long2num (off), scm_long2num (SEEK_SET)); + scm_seek (port, scm_from_long (off), scm_from_long (SEEK_SET)); SCM from = scm_ftell (port); - 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_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 form = scm_read (port); - /* 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); - - - /* 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. @@ -74,15 +57,43 @@ internal_ly_parse_scm (Parse_start *ps) early. */ // scm_close_port (port); - return answer; + if (!SCM_EOF_OBJECT_P (form)) + return scm_cons (form, make_input (ps->start_location_)); + + return SCM_UNDEFINED; } +SCM +internal_ly_eval_scm (Parse_start *ps) +{ + if (ps->parser_ && !SCM_UNBNDP (ps->parser_->local_environment_)) + return scm_local_eval (ps->form_, ps->parser_->local_environment_); + 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 ()); + 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); + return (*ps->func_) (ps); } SCM @@ -107,17 +118,17 @@ protected_ly_parse_scm (Parse_start *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); + return scm_internal_catch (SCM_BOOL_T, + &catch_protected_parse_body, + (void *) ps, + &parse_handler, (void *) ps); } 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 */ +/* Try parsing. Upon failure return SCM_UNDEFINED. */ + SCM ly_parse_scm (char const *s, int *n, Input i, bool safe, Lily_parser *parser) { @@ -125,12 +136,31 @@ ly_parse_scm (char const *s, int *n, Input i, bool safe, Lily_parser *parser) ps.str = s; ps.start_location_ = i; ps.safe_ = safe; + ps.form_ = SCM_UNDEFINED; ps.parser_ = parser; + ps.func_ = internal_ly_parse_scm; SCM ans = parse_protect_global ? protected_ly_parse_scm (&ps) - : internal_ly_parse_scm (&ps); + : internal_ly_parse_scm (&ps); *n = ps.nchars; return ans; } +SCM +ly_eval_scm (SCM form, Input i, bool safe, Lily_parser *parser) +{ + Parse_start ps; + ps.str = 0; + ps.start_location_ = i; + ps.safe_ = safe; + ps.form_ = form; + ps.parser_ = parser; + ps.func_ = internal_ly_eval_scm; + + SCM ans = parse_protect_global ? protected_ly_parse_scm (&ps) + : internal_ly_eval_scm (&ps); + scm_remember_upto_here_1 (form); + return ans; +} +