Run grand-replace (issue 3765)

[lilypond.git] / lily / parse-scm.cc

diff --git a/lily/parse-scm.cc b/lily/parse-scm.cc
index f5092675b3cc124fc730f7e90f00861dfea44b62..58348dc63274ec4f82ea2f75c0b79c2c2d6606ea 100644 (file)
--- a/lily/parse-scm.cc
+++ b/lily/parse-scm.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2004--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2004--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -23,12 +23,13 @@
 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, evaluate one expression.
+/* Pass string to scm parser, read one expression.
    Return result value and #chars read.
 
    Thanks to Gary Houston <ghouston@freewire.co.uk>  */
@@ -38,7 +39,7 @@ internal_ly_parse_scm (Parse_start *ps)
   Source_file *sf = ps->start_location_.get_source_file ();
   SCM port = sf->get_port ();
 
-  int off = ps->start_location_.start () - sf->c_str ();
+  long 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);
@@ -46,33 +47,31 @@ internal_ly_parse_scm (Parse_start *ps)
   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);
+  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);
+
   ps->nchars = scm_to_int (to) - scm_to_int (from);
 
-  /* Read expression from port.  */
   if (!SCM_EOF_OBJECT_P (form))
     {
-      if (ps->safe_)
+      if (ps->parser_->lexer_->top_input ())
         {
-          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);
+          // 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);
         }
-      else
-        answer = scm_primitive_eval (form);
+      if (multiple)
+        form = scm_list_3 (ly_symbol2scm ("apply"),
+                           ly_symbol2scm ("values"),
+                           form);
+      return scm_cons (form, make_input (ps->start_location_));
     }
 
   /* Don't close the port here; if we re-enter this function via a
@@ -81,7 +80,29 @@ internal_ly_parse_scm (Parse_start *ps)
      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 (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
@@ -89,7 +110,7 @@ catch_protected_parse_body (void *p)
 {
   Parse_start *ps = (Parse_start *) p;
 
-  return internal_ly_parse_scm (ps);
+  return (*ps->func_) (ps);
 }
 
 SCM
@@ -123,8 +144,8 @@ protected_ly_parse_scm (Parse_start *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)
 {
@@ -132,7 +153,9 @@ 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);
@@ -141,3 +164,19 @@ ly_parse_scm (char const *s, int *n, Input i, bool safe, Lily_parser *parser)
   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;
+}