*** empty log message ***

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

diff --git a/lily/parse-scm.cc b/lily/parse-scm.cc
index e95eb644f7c84d5bf02ecfcb40c4523bd31e22c4..8fd3cb3ab9620e08c41defc117a46a5014b2d24c 100644 (file)
--- a/lily/parse-scm.cc
+++ b/lily/parse-scm.cc
@@ -1,20 +1,19 @@
 #include <stdio.h>
 
+#include "ly-module.hh"
 #include "lily-guile.hh"
+#include "main.hh"
+#include "paper-book.hh"
 #include "parse-scm.hh"
 #include "string.hh"
 #include "source-file.hh"
 
-/*
-  Pass string to scm parser, evaluate one expression.
-  Return result value and #chars read.
-
-  Thanks to Gary Houston <ghouston@freewire.co.uk>
-
-  Need guile-1.3.4 (>1.3 anyway) for ftell on str ports -- jcn
-*/
+/* Pass string to scm parser, evaluate one expression.
+   Return result value and #chars read.
+   
+   Thanks to Gary Houston <ghouston@freewire.co.uk>  */
 SCM
-internal_ly_parse_scm (Parse_start * ps, bool safe)
+internal_ly_parse_scm (Parse_start * ps)
 {
   Source_file* sf =ps->start_location_.source_file_;
   SCM port = sf->get_port ();
@@ -30,15 +29,9 @@ internal_ly_parse_scm (Parse_start * ps, bool safe)
   /* Read expression from port */
   if (!SCM_EOF_OBJECT_P (form = scm_read (port)))
     {
-      if (safe)
-       {
-         static SCM safe_module;
-         if (!safe_module)
-           safe_module = scm_primitive_eval (ly_symbol2scm ("safe-module"));
-
-         
-         answer = scm_eval (form, safe_module);
-       }
+      if (ps->safe_)
+       answer = scm_eval  (form,
+                           scm_call_0 (ly_scheme_function ("make-safe-lilypond-module")));
       else
        answer = scm_primitive_eval (form);
     }
@@ -47,7 +40,7 @@ internal_ly_parse_scm (Parse_start * ps, bool safe)
      Shouldn't scm_read () do this for us?  */
   scm_fill_input (port);
   SCM to = scm_ftell (port);
-  ps->nchars = gh_scm2int (to) - gh_scm2int (from);
+  ps->nchars = ly_scm2int (to) - ly_scm2int (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.
@@ -62,25 +55,20 @@ SCM
 catch_protected_parse_body (void *p)
 {
   Parse_start *ps = (Parse_start*) p;
-  return internal_ly_parse_scm (ps, false);
-}
-
-SCM
-safe_catch_protected_parse_body (void *p)
-{
-  Parse_start *ps = (Parse_start*) p;
-  return internal_ly_parse_scm (ps, true);
+  
+  return internal_ly_parse_scm (ps);
 }
 
 SCM 
 parse_handler (void * data, SCM tag, SCM args)
 {
   Parse_start* ps = (Parse_start*) data;
-
+  (void) tag;                  // prevent warning
+  
   ps->start_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 (ly_cadr (args), ly_caddr (args), scm_current_error_port ());
 
   /*
     The following is a kludge; we should probably search for
@@ -104,30 +92,27 @@ parse_handler (void * data, SCM tag, SCM args)
 #endif
 
 SCM
-protected_ly_parse_scm (Parse_start *ps, bool safe)
+protected_ly_parse_scm (Parse_start *ps)
 {
   return scm_internal_catch (ly_symbol2scm (READ_ERROR),
-                            (safe ? &safe_catch_protected_parse_body
-                             : catch_protected_parse_body),
-                            (void*)ps,
-                            &parse_handler, (void*)ps);
+                            &catch_protected_parse_body,
+                            (void*) ps,
+                            &parse_handler, (void*) ps);
 }
 
-bool  parse_protect_global  = true; 
+bool parse_protect_global = true; 
 
-/*
-  Try parsing. If failure, then return SCM_UNDEFINED.
- */
+/* Try parsing.  Upon failure return SCM_UNDEFINED. */
 SCM
 ly_parse_scm (char const* s, int *n, Input i, bool safe)
 {
-  
   Parse_start ps ;
   ps.str = s;
   ps.start_location_ = i;
-
-  SCM ans = parse_protect_global ? protected_ly_parse_scm (&ps, safe)
-    : internal_ly_parse_scm (&ps, safe);
+  ps.safe_ = safe;
+  
+  SCM ans = parse_protect_global ? protected_ly_parse_scm (&ps)
+    : internal_ly_parse_scm (&ps);
   *n = ps.nchars;
 
   return ans;