* buildscripts/analyse-cxx-log.py: new file. Read compile log to

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

diff --git a/lily/parse-scm.cc b/lily/parse-scm.cc
index e65e4455110faf1510620829e6466ebf259ce920..4aee3942903de7959dbb7dc5800deb99180780d6 100644 (file)
--- a/lily/parse-scm.cc
+++ b/lily/parse-scm.cc
@@ -1,105 +1,107 @@
-#include <stdio.h>
+/*
+  parse-scm -- Parse a single SCM expression exactly.
+
+  source file of the GNU LilyPond music typesetter
+
+  (c) 2004--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
-#include "lily-guile.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.
+#include <cstdio>
+using namespace std;
+
+#include "main.hh"
+#include "paper-book.hh"
+#include "source-file.hh"
 
-  Thanks to Gary Houston <ghouston@freewire.co.uk>
+/* Pass string to scm parser, evaluate one expression.
+   Return result value and #chars read.
 
-  Need guile-1.3.4 (>1.3 anyway) for ftell on str ports -- jcn
-*/
+   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_;
-  SCM port = sf->get_port();
+  Source_file *sf = ps->start_location_.get_source_file ();
+  SCM port = sf->get_port ();
+
+  int off = ps->start_location_.start () - sf->c_str ();
 
-  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);
 
-  SCM form;
   SCM answer = SCM_UNSPECIFIED;
-
-  /* Read expression from port */
-  if (!SCM_EOF_OBJECT_P (form = scm_read (port)))
-    answer = scm_primitive_eval (form);
- 
-  /*
-   After parsing
-
- (begin (foo 1 2))
-
-   all seems fine, but after parsing
-
- (foo 1 2)
-
-   read_buf has been advanced to read_pos - 1,
-   so that scm_ftell returns 1, instead of #parsed chars
-   */
-  
-  /*
-    urg: reset read_buf for scm_ftell
-    shouldn't scm_read () do this for us?
-  */
+  SCM form = scm_read (port);
+
+  /* Read expression from port.  */
+  if (!SCM_EOF_OBJECT_P (form))
+    {
+      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);
+           }
+         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 = gh_scm2int (to) - gh_scm2int (from);
+  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
-     early.
-
-     scm_close_port (port);
-  */
+     early. */
+  // scm_close_port (port);
 
   return answer;
 }
 
-
 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 
-parse_handler (void * data, SCM tag, SCM args)
+SCM
+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 begining here"));
+  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 (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;
-    
+
   return SCM_UNDEFINED;
 }
 
 /*
   Do some magical incantations: if not, lily will exit on the first
-  GUILE error, leaving no location trace. 
- */
-
+  GUILE error, leaving no location trace.
+*/
 
 #if GUILE_MINOR_VERSION < 7
-  #define READ_ERROR "misc-error"
-  #else
-  #define READ_ERROR "read-error"
+#define READ_ERROR "misc-error"
+#else
+#define READ_ERROR "read-error"
 #endif
 
 SCM
@@ -107,27 +109,26 @@ protected_ly_parse_scm (Parse_start *ps)
 {
   return scm_internal_catch (ly_symbol2scm (READ_ERROR),
                             &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;
 
-/*
-  Try parsing. If failure, then 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)
+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;
+  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;
 }