]> git.donarmstrong.com Git - lilypond.git/blobdiff - lily/lexer.ll
* stepmake/stepmake/*:
[lilypond.git] / lily / lexer.ll
index a5fbdb6a94473bfb6ef976912a13973844e6a807..fe8dacfb7816863c83757962f184425828b196c8 100644 (file)
@@ -518,7 +518,7 @@ BOM_UTF8    \357\273\277
                        else if (tag == ly_symbol2scm ("scheme0-scheme1-scheme2"))
                                return MARKUP_HEAD_SCM0_SCM1_SCM2;
                        else {
-                               programming_error ("no parser tag defined for this signature"); 
+                               programming_error ("no parser tag defined for this markup signature"); 
                                ly_display_scm (s);
                                assert(false);
                        }
@@ -611,6 +611,8 @@ BOM_UTF8    \357\273\277
        return E_CLOSE;
     case '[':
        return E_BRACKET_OPEN;
+    case '+':
+       return E_PLUS;
     case ']':
        return E_BRACKET_CLOSE;
     case '~':
@@ -860,26 +862,6 @@ scan_fraction (String frac)
        return scm_cons (scm_from_int (n), scm_from_int (d));
 }
 
-// Breaks for flex 2.5.31
-#if 0
-/* avoid silly flex induced gcc warnings */
-static void yy_push_state (int) {;}
-static void yy_pop_state () {;}
-static int yy_top_state () { return 0; }
-
-static void
-avoid_silly_flex_induced_gcc_warnings ()
-{
-       (void)yy_start_stack_ptr;
-       (void)yy_start_stack_depth;
-       (void)yy_start_stack;
-       yy_push_state (0);
-       yy_pop_state ();
-       yy_top_state ();
-       avoid_silly_flex_induced_gcc_warnings ();
-}
-#endif
-
 SCM
 lookup_markup_command (String s)
 {
@@ -920,6 +902,10 @@ music_function_type (SCM func)
        {
                return MUSIC_FUNCTION_SCM_SCM_MUSIC;
        }
+       else if (type == ly_symbol2scm ("scm-scm-scm"))
+       {
+               return MUSIC_FUNCTION_SCM_SCM_SCM;
+       }
        else if (type == ly_symbol2scm ("markup"))
        {
                return MUSIC_FUNCTION_MARKUP;