* flower/international.cc:

[lilypond.git] / lily / lexer.ll

diff --git a/lily/lexer.ll b/lily/lexer.ll
index 47a25a30020d9fb9d52e0b199a4c926ff1463ffa..2aa5551d7d67bcb84f784580500afbdc2cd9d0b8 100644 (file)
--- a/lily/lexer.ll
+++ b/lily/lexer.ll
@@ -4,7 +4,7 @@
 
   source file of the LilyPond music typesetter
 
-  (c) 1996--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
            Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
@@ -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"
@@ -112,7 +112,7 @@ SCM (* scm_parse_error_handler) (void *);
 %x markup
 %x notes
 %x quote
-%x renameinput
+%x sourcefilename
 %x version
 
 A              [a-zA-Z]
@@ -153,7 +153,7 @@ BOM_UTF8    \357\273\277
 <INITIAL,chords,lyrics,figures,notes>{BOM_UTF8} {
   if (this->lexloc->line_number () != 1 || this->lexloc->column_number () != 0)
     {
-      LexerError (_ ("stray UTF-8 BOM encountered").to_str0 ());
+      LexerError (_ ("stray UTF-8 BOM encountered").c_str ());
       exit (1);
     }
   if (be_verbose_global)
@@ -180,8 +180,8 @@ BOM_UTF8    \357\273\277
 <INITIAL,chords,lyrics,notes,figures>\\version{WHITE}* {
        yy_push_state (version);
 }
-<INITIAL,chords,lyrics,notes,figures>\\renameinput{WHITE}*     {
-       yy_push_state (renameinput);
+<INITIAL,chords,lyrics,notes,figures>\\sourcefilename{WHITE}*  {
+       yy_push_state (sourcefilename);
 }
 <version>\"[^"]*\"     { /* got the version number */
        String s (YYText () + 1);
@@ -195,7 +195,7 @@ BOM_UTF8    \357\273\277
        scm_module_define (top_scope, ly_symbol2scm ("version-seen?"), SCM_BOOL_T);
 
 }
-<renameinput>\"[^"]*\"     {
+<sourcefilename>\"[^"]*\"     {
        String s (YYText () + 1);
        s = s.left_string (s.index_last ('\"'));
 
@@ -209,11 +209,11 @@ BOM_UTF8  \357\273\277
 
 }
 <version>.     {
-       LexerError (_ ("quoted string expected after \\version").to_str0 ());
+       LexerError (_ ("quoted string expected after \\version").c_str ());
        yy_pop_state ();
 }
-<renameinput>.         {
-       LexerError (_ ("quoted string expected after \\renameinput").to_str0 ());
+<sourcefilename>>.     {
+       LexerError (_ ("quoted string expected after \\sourcefilename").c_str ());
        yy_pop_state ();
 }
 <longcomment>{
@@ -226,7 +226,7 @@ BOM_UTF8    \357\273\277
                yy_pop_state ();
        }
        <<EOF>>         {
-               LexerError (_ ("EOF found inside a comment").to_str0 ());
+               LexerError (_ ("EOF found inside a comment").c_str ());
                is_main_input_ = false;
                if (! close_input ()) 
                  yyterminate (); // can't move this, since it actually rets a YY_NULL
@@ -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;
 }
@@ -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);
                        }
@@ -570,8 +570,9 @@ BOM_UTF8    \357\273\277
        Real r;
        int cnv = sscanf (YYText (), "%lf", &r);
        assert (cnv == 1);
+       (void) cnv;
 
-       yylval.scm = scm_make_real (r);
+       yylval.scm = scm_from_double (r);
        return REAL;
 }
 
@@ -611,6 +612,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 +860,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 +903,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 +939,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