X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparse-scm.cc;h=f55be9829d81635f017a5bddaefdc3aa1996ec16;hb=5b4b0d6e9a197e8f9eb085b7c2ad78b8be3e5cfc;hp=0769083cfa6c4f1371659a4612f3bd9fee4c0d52;hpb=3920b02188c3c6b0190626a936c586fe687a4a2d;p=lilypond.git

diff --git a/lily/parse-scm.cc b/lily/parse-scm.cc
index 0769083cfa..f55be9829d 100644
--- a/lily/parse-scm.cc
+++ b/lily/parse-scm.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  (c) 2004--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "parse-scm.hh"
@@ -11,6 +11,7 @@
 #include <cstdio>
 using namespace std;
 
+#include "lily-parser.hh"
 #include "international.hh"
 #include "main.hh"
 #include "paper-book.hh"
@@ -31,9 +32,19 @@ internal_ly_parse_scm (Parse_start *ps)
   scm_seek (port, scm_long2num (off), scm_long2num (SEEK_SET));
   SCM from = scm_ftell (port);
 
+  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);
 
+  /* Reset read_buf for scm_ftell.
+     Shouldn't scm_read () do this for us?  */
+  scm_fill_input (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))
     {
@@ -45,18 +56,18 @@ internal_ly_parse_scm (Parse_start *ps)
 	      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);
 	}
       else
 	answer = scm_primitive_eval (form);
     }
 
-  /* Reset read_buf for scm_ftell.
-     Shouldn't scm_read () do this for us?  */
-  scm_fill_input (port);
-  SCM to = scm_ftell (port);
-  ps->nchars = scm_to_int (to) - scm_to_int (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.
      It's a string port anyway, so there's no advantage to closing it
@@ -78,37 +89,25 @@ SCM
 parse_handler (void *data, SCM tag, SCM args)
 {
   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 (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;
+  if (tag == ly_symbol2scm ("read-error"))
+    ps->nchars = 1;
 
   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 #t : catch all Scheme level errors.
+   */
+  return scm_internal_catch (SCM_BOOL_T, 
 			     &catch_protected_parse_body,
 			     (void *) ps,
 			     &parse_handler, (void *) ps);
@@ -120,12 +119,13 @@ bool parsed_objects_should_be_dead = false;
 /* 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, Lily_parser *parser)
 {
   Parse_start ps;
   ps.str = s;
   ps.start_location_ = i;
   ps.safe_ = safe;
+  ps.parser_ = parser;
 
   SCM ans = parse_protect_global ? protected_ly_parse_scm (&ps)
     : internal_ly_parse_scm (&ps);