* scm/define-music-types.scm (music-descriptions): remove

[lilypond.git] / lily / lexer.ll

diff --git a/lily/lexer.ll b/lily/lexer.ll
index 2fd018ff1b2afa0ee6846d385057e7ff58ef3534..178ea88e97eb9d070e22359aa0458f2487158fab 100644 (file)
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -227,6 +227,7 @@ BOM_UTF8    \357\273\277
        int i;
        sscanf (YYText (), "%d", &i);
 
+//     this->set_debug (1); 
        yy_pop_state ();
        this->here_input ().get_source_file ()->set_line (here_input ().start (), i);
 }
@@ -338,7 +339,7 @@ BOM_UTF8    \357\273\277
        }
                
        yylval.scm = sval;
-       return SCM_T;
+       return SCM_TOKEN;
 }
 <INITIAL,notes,lyrics>{ 
        \<\<    {
@@ -550,7 +551,7 @@ BOM_UTF8    \357\273\277
        }
 }
 
-<<EOF>> {
+<*><<EOF>> {
        if (is_main_input_)
        {
                is_main_input_ = false;
@@ -912,7 +913,7 @@ static void init_signature_hash_table ()
        };
 
        for (int i = 0; sigs[i].symbol; i++)
-               scm_hashq_set_x (signature_hash_table, scm_gc_protect_object (ly_symbol2scm (sigs[i].symbol)),
+               scm_hashq_set_x (signature_hash_table, ly_symbol2scm (sigs[i].symbol),
                                 scm_from_int (sigs[i].token_type));
 }