X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fparse-scm.cc;h=51acd6e6ca658793d5b41e2f146bad608d45bd6e;hb=5091a221086ba923451781a1d51a2a715369b7e4;hp=878dac48b99f86836fe7a33b3428a93e11376ed0;hpb=c1e549802b23c458bcd808c6edcc6f8dfcd6fd68;p=lilypond.git

diff --git a/lily/parse-scm.cc b/lily/parse-scm.cc
index 878dac48b9..51acd6e6ca 100644
--- a/lily/parse-scm.cc
+++ b/lily/parse-scm.cc
@@ -1,39 +1,52 @@
 /*
-  parse-scm --
+  parse-scm -- Parse a single SCM expression exactly.
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2004--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
 #include "parse-scm.hh"
 
 #include <cstdio>
+using namespace std;
 
+#include "international.hh"
 #include "main.hh"
 #include "paper-book.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>  */
 SCM
-internal_ly_parse_scm (Parse_start * ps)
+internal_ly_parse_scm (Parse_start *ps)
 {
-  Source_file *sf = ps->start_location_.source_file_;
+  Source_file *sf = ps->start_location_.get_source_file ();
   SCM port = sf->get_port ();
 
-  int off = ps->start_location_.start_ - sf->to_str0 ();
-  
+  int off = ps->start_location_.start () - sf->c_str ();
+
   scm_seek (port, scm_long2num (off), scm_long2num (SEEK_SET));
   SCM from = scm_ftell (port);
 
-  SCM form;
+  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 = scm_read (port)))
+  if (!SCM_EOF_OBJECT_P (form))
     {
       if (ps->safe_)
 	{
@@ -48,12 +61,6 @@ internal_ly_parse_scm (Parse_start * ps)
       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.
@@ -67,53 +74,41 @@ internal_ly_parse_scm (Parse_start * ps)
 SCM
 catch_protected_parse_body (void *p)
 {
-  Parse_start *ps = (Parse_start*) p;
-  
+  Parse_start *ps = (Parse_start *) p;
+
   return internal_ly_parse_scm (ps);
 }
 
-SCM 
+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"));
+  Parse_start *ps = (Parse_start *) data;
+
+  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);
+			     (void *) ps,
+			     &parse_handler, (void *) ps);
 }
 
-bool parse_protect_global = true; 
+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  */
@@ -124,11 +119,11 @@ ly_parse_scm (char const *s, int *n, Input i, bool safe)
   ps.str = s;
   ps.start_location_ = i;
   ps.safe_ = safe;
-  
+
   SCM ans = parse_protect_global ? protected_ly_parse_scm (&ps)
     : internal_ly_parse_scm (&ps);
   *n = ps.nchars;
 
-  return ans;  
+  return ans;
 }