* stepmake/stepmake/*:

[lilypond.git] / lily / lexer.ll

diff --git a/lily/lexer.ll b/lily/lexer.ll
index 2cf4f3fb67f8c47e0aa105f738f0a743e76d5c61..fe8dacfb7816863c83757962f184425828b196c8 100644 (file)
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -22,9 +22,10 @@
  */
 
 
-#include <stdio.h>
-#include <ctype.h>
-#include <errno.h>
+
+#include <cstdio>
+#include <cctype>
+#include <cerrno>
 
 /* Flex >= 2.5.29 fix; FlexLexer.h's multiple include bracing breaks
    when building the actual lexer.  */
@@ -32,7 +33,6 @@
 #define LEXER_CC
 
 #include <iostream>
-
 using namespace std;
 
 #include "music-function.hh"
@@ -200,7 +200,7 @@ BOM_UTF8    \357\273\277
        s = s.left_string (s.index_last ('\"'));
 
        yy_pop_state ();
-       this->here_input().source_file_->name_ = s;
+       this->here_input().get_source_file ()->name_ = s;
        message (_f ("Renaming input to: `%s'", s.to_str0 ()));
        progress_indication ("\n");
        scm_module_define (scm_car (scopes_),
@@ -278,7 +278,7 @@ BOM_UTF8    \357\273\277
        exit (1);
 }
 <chords,notes,figures>{RESTNAME}       {
-       const char *s = YYText ();
+       char const *s = YYText ();
        yylval.scm = scm_makfrom0str (s);
        return RESTNAME;
 }
@@ -289,7 +289,7 @@ BOM_UTF8    \357\273\277
        int n = 0;
        Input hi = here_input();
        hi.step_forward ();
-       SCM sval = ly_parse_scm (hi.start_, &n, hi,
+       SCM sval = ly_parse_scm (hi.start (), &n, hi,
                be_safe_global && is_main_input_);
 
        if (sval == SCM_UNDEFINED)
@@ -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);
                        }
@@ -571,7 +571,7 @@ BOM_UTF8    \357\273\277
        int cnv = sscanf (YYText (), "%lf", &r);
        assert (cnv == 1);
 
-       yylval.scm = scm_make_real (r);
+       yylval.scm = scm_from_double (r);
        return REAL;
 }
 
@@ -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 '~':
@@ -857,28 +859,8 @@ scan_fraction (String frac)
 
        int n = String_convert::dec2int (left);
        int d = String_convert::dec2int (right);
-       return scm_cons (scm_int2num (n), scm_int2num (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 ();
+       return scm_cons (scm_from_int (n), scm_from_int (d));
 }
-#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;
@@ -952,3 +938,35 @@ music_function_type (SCM func)
 
        return MUSIC_FUNCTION_SCM;
 }
+
+/* Shut up lexer warnings.  */
+#if YY_STACK_USED
+
+static void
+yy_push_state (int)
+{
+}
+
+static void
+yy_pop_state ()
+{
+}
+
+static int
+yy_top_state ()
+{
+  return 0;
+}
+
+static void
+silence_lexer_warnings ()
+{
+   (void) yy_start_stack_ptr;
+   (void) yy_start_stack_depth;
+   (void) yy_start_stack;
+   (void) yy_push_state;
+   (void) yy_pop_state;
+   (void) yy_top_state;
+   (void) silence_lexer_warnings;
+}
+#endif