X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparse-scm.cc;h=5156ae6623e502481f6ab7704494d90eec396de1;hb=81d5f3ea5db5b76b81956c9504fd84dbbb51a060;hp=2523b33999c4d1a375190bc74478572774e74e74;hpb=fdf32024a6ab7ec992490ed567f9cd3edeff21ff;p=lilypond.git

diff --git a/lily/parse-scm.cc b/lily/parse-scm.cc
index 2523b33999..5156ae6623 100644
--- a/lily/parse-scm.cc
+++ b/lily/parse-scm.cc
@@ -13,12 +13,12 @@
    
    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_;
+  Source_file *sf =ps->start_location_.source_file_;
   SCM port = sf->get_port ();
 
-  int off = ps->start_location_.defined_str0_ - sf->to_str0();
+  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);
@@ -26,20 +26,12 @@ internal_ly_parse_scm (Parse_start * ps, bool safe)
   SCM form;
   SCM answer = SCM_UNSPECIFIED;
 
-  /* Read expression from port */
+  /* 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"));
-	      if (output_format_global == PAGE_LAYOUT)
-		ly_import_module (safe_module, scm_c_resolve_module ("lily"));
-	    }
-	  answer = scm_eval (form, safe_module);
-	}
+      SCM function = ly_scheme_function ("make-safe-lilypond-module");
+      if (ps->safe_)
+	answer = scm_eval (form, function);
       else
 	answer = scm_primitive_eval (form);
     }
@@ -48,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.
@@ -63,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_handler (void *data, SCM tag, SCM args)
 {
-  Parse_start* ps = (Parse_start*) data;
-
+  Parse_start* ps = (Parse_start *) data;
+  (void) tag;
+  
   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
@@ -105,27 +92,28 @@ 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),
+			     &catch_protected_parse_body,
 			     (void*) ps,
 			     &parse_handler, (void*) ps);
 }
 
 bool parse_protect_global = true; 
 
-/* Try parsing.  Upon failure return SCM_UNDEFINED. */
+/* Try parsing.  Upon failure return SCM_UNDEFINED.
+   FIXME: shouldn't we return SCM_UNSCPECIFIED -- jcn  */
 SCM
-ly_parse_scm (char const* s, int *n, Input i, bool safe)
+ly_parse_scm (char const *s, int *n, Input i, bool safe)
 {
-  Parse_start ps ;
+  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;