Merge branch 'cvs-head' of ssh+git://hanwen@repo.or.cz/srv/git/lilypond into master...

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

diff --git a/lily/parse-scm.cc b/lily/parse-scm.cc
index 4aee3942903de7959dbb7dc5800deb99180780d6..c8d8d36bfab2f2ca2a393d9c17c6e00c7dd42917 100644 (file)
--- a/lily/parse-scm.cc
+++ b/lily/parse-scm.cc
@@ -11,6 +11,7 @@
 #include <cstdio>
 using namespace std;
 
+#include "international.hh"
 #include "main.hh"
 #include "paper-book.hh"
 #include "source-file.hh"
@@ -93,27 +94,20 @@ parse_handler (void *data, SCM tag, SCM args)
   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);
 }
 
 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  */