* lily/include/input.hh (class Input): new `end_' slot for end of

[lilypond.git] / lily / lexer.ll

diff --git a/lily/lexer.ll b/lily/lexer.ll
index 0a209abf20761e78d73683c511a51f205f14e6f0..2e4d96401ef029c1881a2e09e8d3f9713d4ff53f 100644 (file)
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -76,6 +76,9 @@ bool is_valid_version (String s);
 #define yylval \
        (*(YYSTYPE*)lexval)
 
+#define yylloc \
+       (*(YYLTYPE*)lexloc)
+
 #define YY_USER_ACTION add_lexed_char (YYLeng ());
 /*
 
@@ -272,10 +275,10 @@ HYPHEN            --
        return MULTI_MEASURE_REST;
 }
 <INITIAL,markup,chords,lyrics,notes,figures>#  { //embedded scm
-       //char const* s = YYText () + 1;
-       char const* s = here_str0 ();
        int n = 0;
-       SCM sval = ly_parse_scm (s, &n, here_input (),
+       Input hi = here_input();
+       hi.step_forward ();
+       SCM sval = ly_parse_scm (hi.start_, &n, hi,
                be_safe_global && main_input_b_);
 
        if (sval == SCM_UNDEFINED)