* stepmake/stepmake/*:

[lilypond.git] / lily / lexer.ll

diff --git a/lily/lexer.ll b/lily/lexer.ll
index 0914fee3290361f3fb188d41e1f79c4ba5194da4..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"
@@ -109,7 +109,7 @@ SCM (* scm_parse_error_handler) (void *);
 %x lyrics
 %x lyric_quote
 %x longcomment
-%x markup 
+%x markup
 %x notes
 %x quote
 %x renameinput
@@ -142,6 +142,7 @@ LYRICS              ({AA}|{TEX})[^0-9 \t\n\r\f]*
 ESCAPED                [nt\\'"]
 EXTENDER       __
 HYPHEN         --
+BOM_UTF8       \357\273\277
 %%
 
 
@@ -149,7 +150,17 @@ HYPHEN             --
        // windows-suck-suck-suck
 }
 
-<INITIAL,chords,incl,markup,lyrics,notes,figures>{
+<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 ());
+      exit (1);
+    }
+  if (be_verbose_global)
+     message (_ ("Skipping UTF-8 BOM"));
+}
+
+<INITIAL,chords,figures,incl,lyrics,markup,notes>{
   "%{" {
        yy_push_state (longcomment);
   }
@@ -188,9 +199,9 @@ HYPHEN              --
        String s (YYText () + 1);
        s = s.left_string (s.index_last ('\"'));
 
-       yy_pop_state();
-       this->here_input().source_file_->name_ = s;
-       progress_indication (_f ("Renaming input to: `%s'", s.to_str0 ()));
+       yy_pop_state ();
+       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_),
                     ly_symbol2scm ("input-file-name"),
@@ -198,11 +209,11 @@ HYPHEN            --
 
 }
 <version>.     {
-       LexerError (_ ("No quoted string found after \\version").to_str0 ());
+       LexerError (_ ("quoted string expected after \\version").to_str0 ());
        yy_pop_state ();
 }
 <renameinput>.         {
-       LexerError (_ ("No quoted string found after \\renameinput").to_str0 ());
+       LexerError (_ ("quoted string expected after \\renameinput").to_str0 ());
        yy_pop_state ();
 }
 <longcomment>{
@@ -263,22 +274,22 @@ HYPHEN            --
          }
 }
 <incl>\"[^"]*   { // backup rule
-       error (_ ("Missing end quote"));
+       error (_ ("end quote missing"));
        exit (1);
 }
 <chords,notes,figures>{RESTNAME}       {
-       const char *s = YYText ();
+       char const *s = YYText ();
        yylval.scm = scm_makfrom0str (s);
        return RESTNAME;
 }
 <chords,notes,figures>R                {
        return MULTI_MEASURE_REST;
 }
-<INITIAL,markup,chords,lyrics,notes,figures>#  { //embedded scm
+<INITIAL,chords,figures,lyrics,markup,notes>#  { //embedded scm
        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)
@@ -507,7 +518,7 @@ HYPHEN              --
                        else if (tag == ly_symbol2scm ("scheme0-scheme1-scheme2"))
                                return MARKUP_HEAD_SCM0_SCM1_SCM2;
                        else {
-                               programming_error ("No parser tag defined for this signature. Abort"); 
+                               programming_error ("no parser tag defined for this markup signature"); 
                                ly_display_scm (s);
                                assert(false);
                        }
@@ -560,7 +571,7 @@ HYPHEN              --
        int cnv = sscanf (YYText (), "%lf", &r);
        assert (cnv == 1);
 
-       yylval.scm = scm_make_real (r);
+       yylval.scm = scm_from_double (r);
        return REAL;
 }
 
@@ -589,9 +600,9 @@ HYPHEN              --
 
     switch (c) {
     case '>':
-       return E_BIGGER;
+       return E_ANGLE_CLOSE;
     case '<':
-       return E_SMALLER;
+       return E_ANGLE_OPEN;
     case '!':
        return E_EXCLAMATION;
     case '(':
@@ -599,9 +610,11 @@ HYPHEN             --
     case ')':
        return E_CLOSE;
     case '[':
-       return E_LEFTSQUARE;
+       return E_BRACKET_OPEN;
+    case '+':
+       return E_PLUS;
     case ']':
-       return E_RIGHTSQUARE;
+       return E_BRACKET_CLOSE;
     case '~':
        return E_TILDE;
     case '\\':
@@ -681,15 +694,16 @@ Lily_lexer::scan_escaped_word (String str)
 
 //     SCM sym = ly_symbol2scm (str.to_str0 ());
 
-       int l = lookup_keyword (str);
-       if (l != -1) {
-               return l;
-       }
+       int i = lookup_keyword (str);
+       if (i == MARKUP && is_lyric_state ())
+               return LYRIC_MARKUP;
+       if (i != -1)
+               return i;
+
        SCM sid = lookup_identifier (str);
        if (is_music_function (sid))
        {
                yylval.scm = get_music_function_transform (sid);
-               
                return music_function_type (yylval.scm);
        }
 
@@ -845,29 +859,9 @@ 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));
+       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)
 {
@@ -908,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;
@@ -935,8 +933,40 @@ music_function_type (SCM func)
        else
                {
                /* TODO: print location */
-               error ("Can not find signature for music function.");
+               error (_ ("can't find signature for music function"));
                }
 
        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