-#include <stdio.h>
+/*
+ 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 <hanwen@xs4all.nl>
-/*
- 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 <ghouston@freewire.co.uk>
+ 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 <http://www.gnu.org/licenses/>.
*/
+
+#include "parse-scm.hh"
+
+#include <cstdio>
+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"
+
+/* Pass string to scm parser, read one expression.
+ Return result value and #chars read.
+
+ Thanks to Gary Houston <ghouston@freewire.co.uk> */
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();
+ 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));
- SCM from = scm_ftell (port);
+ long off = hi.start () - sf->c_str ();
- SCM form;
- SCM answer = SCM_UNSPECIFIED;
-
- /* Read expression from port */
- if (!SCM_EOF_OBJECT_P (form = scm_read (port)))
- answer = scm_primitive_eval (form);
-
- /*
- After parsing
+ scm_seek (port, scm_from_long (off), scm_from_long (SEEK_SET));
+ SCM from = scm_ftell (port);
- (begin (foo 1 2))
+ 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));
- all seems fine, but after parsing
+ bool multiple = ly_is_equal (scm_peek_char (port), SCM_MAKE_CHAR ('@'));
- (foo 1 2)
+ if (multiple)
+ (void) scm_read_char (port);
- 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?
- */
- scm_fill_input (port);
+ SCM form = scm_read (port);
SCM to = scm_ftell (port);
- ps->nchars = gh_scm2int (to) - gh_scm2int (from);
+
+ hi.set (hi.get_source_file (),
+ hi.start (),
+ hi.start () + scm_to_int (scm_difference (to, from)));
+
+ if (!SCM_EOF_OBJECT_P (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;
+ }
/* 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.
+ early. */
+ // scm_close_port (port);
- 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 (module == SCM_BOOL_F)
+ {
+ SCM function = ly_lily_module_constant ("make-safe-lilypond-module");
+ module = scm_gc_protect_object (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 internal_ly_parse_scm (static_cast<Parse_start *> (p));
}
-SCM
-parse_handler (void * data, SCM tag, SCM args)
+SCM
+catch_protected_eval_body (void *p)
{
- Parse_start* ps = (Parse_start*) data;
+ return internal_ly_eval_scm (static_cast<Parse_start *> (p));
+}
+
+SCM
+parse_handler (void *data, SCM /*tag*/, SCM args)
+{
+ Parse_start *ps = (Parse_start *) data;
- ps->start_location_.error (_("GUILE signaled an error for the expression begining here"));
+ ps->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 ());
- /*
- 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;
+ 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_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);
+}
+SCM
+protected_ly_eval_scm (Parse_start *ps)
+{
+ /*
+ Catch #t : catch all Scheme level errors.
+ */
+ return scm_internal_catch (SCM_BOOL_T,
+ catch_protected_eval_body,
+ (void *) ps,
+ &parse_handler, (void *) ps);
}
+bool parse_protect_global = true;
+bool parsed_objects_should_be_dead = false;
-static bool protect = true;
+/* Try parsing. Upon failure return SCM_UNDEFINED. */
-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.")
+SCM
+ly_parse_scm (Input &i, bool safe, Lily_parser *parser)
{
- protect = (t == SCM_BOOL_T);
- return SCM_UNSPECIFIED;
+ Parse_start ps (SCM_UNDEFINED, i, safe, parser);
+
+ SCM ans = parse_protect_global ? protected_ly_parse_scm (&ps)
+ : internal_ly_parse_scm (&ps);
+
+ return ans;
}
SCM
-ly_parse_scm (char const* s, int *n, Input i)
+ly_eval_scm (SCM form, Input i, bool safe, Lily_parser *parser)
{
-
- Parse_start ps ;
- ps.str = s;
- ps.start_location_ = i;
-
- SCM ans = protect ? protected_ly_parse_scm (&ps)
- : internal_ly_parse_scm (&ps);
- *n = ps.nchars;
- return ans;
-}
+ Parse_start ps (form, i, safe, parser);
+ SCM ans = parse_protect_global ? protected_ly_eval_scm (&ps)
+ : internal_ly_eval_scm (&ps);
+ scm_remember_upto_here_1 (form);
+ return ans;
+}
projects / lilypond.git / blobdiff