]> git.donarmstrong.com Git - lilypond.git/commitdiff
catch all GUILE exceptions
authorHan-Wen Nienhuys <hanwen@xs4all.nl>
Sun, 5 Nov 2006 12:18:37 +0000 (13:18 +0100)
committerHan-Wen Nienhuys <hanwen@xs4all.nl>
Sun, 5 Nov 2006 12:18:37 +0000 (13:18 +0100)
lily/parse-scm.cc

index 0769083cfa6c4f1371659a4612f3bd9fee4c0d52..c8d8d36bfab2f2ca2a393d9c17c6e00c7dd42917 100644 (file)
@@ -94,21 +94,13 @@ 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);