Release: bump version.

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

diff --git a/lily/parse-scm.cc b/lily/parse-scm.cc
index 7fea6f7d2c390e68f5d72585afeb6d42d578e7fe..fbd60a941a4bdff3b1536fd5ce11c97ca4c6aff4 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--2012 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,6 +23,7 @@
 using namespace std;
 
 #include "lily-parser.hh"
+#include "lily-lexer.hh"
 #include "international.hh"
 #include "main.hh"
 #include "paper-book.hh"
@@ -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);
@@ -51,43 +52,50 @@ internal_ly_parse_scm (Parse_start *ps)
   SCM to = scm_ftell (port);
   ps->nchars = scm_to_int (to) - scm_to_int (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);
+        }
+      return scm_cons (form, make_input (ps->start_location_));
+    }
+
   /* 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. */
   // scm_close_port (port);
 
-  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);
-       }
-      
+        {
+          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 ());
+        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)
 {