catch GUILE errors

[lilypond.git] / lily / lexer.ll

diff --git a/lily/lexer.ll b/lily/lexer.ll
index 295613c172980412e4fa485f6d28070d68de8a53..cbaea6e8612dbec8cd7d0192a200b7a78e20c52e 100644 (file)
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -28,6 +28,7 @@
 
 #include <iostream>
 
+#include "parse-scm.hh"
 #include "score.hh"
 #include "lily-guile.hh"
 #include "string.hh"
@@ -76,6 +77,8 @@ LYRICS                ({AA}|{TEX})[^0-9 \t\n\f]*
 
 
 SCM scan_fraction (String);
+SCM (* scm_parse_error_handler) (void *);
+
 
 %}
 
@@ -258,7 +261,7 @@ HYPHEN              --
                yylval.scm =  SCM_EOL;
                return SCM_T;
        }
-       yylval.scm = ly_parse_scm (s, &n);
+       yylval.scm = ly_parse_scm (s, &n, here_input());
        
        for (int i=0; i < n; i++)
        {