]> git.donarmstrong.com Git - lilypond.git/blobdiff - lily/lexer.ll
2003 -> 2004
[lilypond.git] / lily / lexer.ll
index e02376b9836000cde89a527f38aa10f5a78de2d8..86b48b218d94feaf35ba3db7a98d1ea5366f865a 100644 (file)
@@ -1,10 +1,10 @@
 %{ // -*-Fundamental-*-
 /*
-  lexer.l -- implement the Flex lexer
+  lexer.ll -- implement the Flex lexer
 
   source file of the LilyPond music typesetter
 
-  (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
            Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include <ctype.h>
 #include <errno.h>
 
+/* Flex >= 2.5.29 fix; FlexLexer.h's multiple include bracing breaks
+   when building the actual lexer.  */
+#define LEXER_CC
+
 #include <iostream>
+using namespace std;
 
+#include "source-file.hh"
 #include "parse-scm.hh"
-#include "score.hh"
 #include "lily-guile.hh"
 #include "string.hh"
 #include "string-convert.hh"
 #include "my-lily-lexer.hh"
-#include "file-results.hh"
+#include "input-file-results.hh"
 #include "interval.hh"
 #include "lily-guile.hh"
 #include "parser.hh"
 #include "warn.hh"
 #include "main.hh"
-#include "musical-request.hh"
 #include "version.hh"
 #include "lilypond-input-version.hh"
-#include "translator-def.hh"
-#include "music-output-def.hh"
+#include "context-def.hh"
+#include "identifier-smob.hh"
 
 /*
 RH 7 fix (?)
@@ -55,6 +59,8 @@ void strip_trailing_white (String&);
 void strip_leading_white (String&);
 String lyric_fudge (String s);
 
+SCM
+lookup_markup_command (String s);
 
 bool
 valid_version_b (String s);
@@ -80,6 +86,7 @@ SCM scan_fraction (String);
 SCM (* scm_parse_error_handler) (void *);
 
 
+
 %}
 
 %option c++
@@ -91,6 +98,7 @@ SCM (* scm_parse_error_handler) (void *);
 %option never-interactive 
 %option warn
 
+%x renameinput
 %x version
 %x chords
 %x incl
@@ -99,7 +107,7 @@ SCM (* scm_parse_error_handler) (void *);
 %x figures
 %x quote
 %x longcomment
-
+%x markup 
 
 A              [a-zA-Z]
 AA             {A}|_
@@ -113,6 +121,7 @@ WORD                {A}{AN}*
 ALPHAWORD      {A}+
 DIGIT          {N}
 UNSIGNED       {N}+
+E_UNSIGNED     \\{N}+
 FRACTION       {N}+\/{N}+
 INT            -?{UNSIGNED}
 REAL           ({INT}\.{N}*)|(-?\.{N}+)
@@ -122,7 +131,8 @@ HORIZONTALWHITE             [ \t]
 BLACK          [^ \n\t\f\r]
 RESTNAME       [rs]
 NOTECOMMAND    \\{A}+
-LYRICS         ({AA}|{TEX})[^0-9 \t\n\f]*
+MARKUPCOMMAND  \\({A}|[-_])+
+LYRICS         ({AA}|{TEX})[^0-9 \t\n\r\f]*
 ESCAPED                [nt\\'"]
 EXTENDER       __
 HYPHEN         --
@@ -133,17 +143,17 @@ HYPHEN            --
        // windows-suck-suck-suck
 }
 
-<INITIAL,chords,incl,lyrics,notes,figures>{
+<INITIAL,chords,incl,markup,lyrics,notes,figures>{
   "%{" {
        yy_push_state (longcomment);
   }
-  %[^{\n].*\n  {
+  %[^{\n\r].*[\n\r]    {
   }
-  %[^{\n]      { // backup rule
+  %[^{\n\r]    { // backup rule
   }
-  %\n  {
+  %[\n\r]      {
   }
-  %[^{\n].*    {
+  %[^{\n\r].*  {
   }
   {WHITE}+     {
 
@@ -153,18 +163,38 @@ HYPHEN            --
 <INITIAL,chords,lyrics,notes,figures>\\version{WHITE}* {
        yy_push_state (version);
 }
+<INITIAL,chords,lyrics,notes,figures>\\renameinput{WHITE}*     {
+       yy_push_state (renameinput);
+}
 <version>\"[^"]*\"     { /* got the version number */
        String s (YYText ()+1);
-       s = s.left_string (s.index_last ('"'));
+       s = s.left_string (s.index_last ('\"'));
 
-       yy_pop_state ();
-       if (!valid_version_b (s))
+       yy_pop_state();
+        if (!valid_version_b (s))
                return INVALID;
 }
+<renameinput>\"[^"]*\"     { /* got the version number */
+       String s (YYText ()+1);
+       s = s.left_string (s.index_last ('\"'));
+
+       yy_pop_state();
+       this->here_input().source_file_->name_ = s;
+       progress_indication (_f("\nRenamed input to `%s'", s.to_str0()));
+       scm_module_define (gh_car (scopes_),
+                    ly_symbol2scm ("input-file-name"),
+                    scm_makfrom0str (s.to_str0()));
+
+}
+
 <version>.     {
        LexerError ("No quoted string found after \\version");
        yy_pop_state ();
 }
+<renameinput>.         {
+       LexerError ("No quoted string found after \\renameinput");
+       yy_pop_state ();
+}
 <longcomment>{
        [^\%]*          {
        }
@@ -176,6 +206,7 @@ HYPHEN              --
        }
        <<EOF>>         {
                LexerError (_ ("EOF found inside a comment").to_str0 ());
+               main_input_b_ = false;
                if (! close_input ()) 
                  yyterminate (); // can't move this, since it actually rets a YY_NULL
        }
@@ -189,7 +220,7 @@ HYPHEN              --
                main_input_b_ = true;
        }
        else
-               error (_ ("\\maininput disallowed outside init files"));
+               error (_ ("\\maininput not allowed outside init files"));
 }
 
 <INITIAL,chords,lyrics,figures,notes>\\include           {
@@ -252,25 +283,42 @@ HYPHEN            --
        exit (1);
 }
 
-<INITIAL,chords,lyrics,notes,figures># { //embedded scm
+<INITIAL,markup,chords,lyrics,notes,figures>#  { //embedded scm
        //char const* s = YYText () + 1;
        char const* s = here_str0 ();
        int n = 0;
-       if (main_input_b_ && safe_global_b) {
-               error (_ ("Can't evaluate Scheme in safe mode"));
-               yylval.scm =  SCM_EOL;
-               return SCM_T;
-       }
-       yylval.scm = ly_parse_scm (s, &n, here_input());
-       
+       SCM sval = ly_parse_scm (s, &n, here_input (),
+               safe_global_b && main_input_b_);
+
+       if (sval == SCM_UNDEFINED)
+       {
+               sval = SCM_UNSPECIFIED;
+               errorlevel_ = 1;
+       }
+
        for (int i=0; i < n; i++)
        {
                yyinput ();
        }
        char_count_stack_.top () += n;
 
+       if (unpack_identifier (sval) != SCM_UNDEFINED)
+       {
+               yylval.scm = unpack_identifier(sval);
+               return identifier_type (yylval.scm);
+       }
+               
+       yylval.scm = sval;
        return SCM_T;
 }
+<INITIAL,notes,lyrics>{ 
+       \<\<   {
+               return LESSLESS;
+       }
+       \>\>   {
+               return MOREMORE;
+       }
+}
 <figures>{
        _       {
                return FIGURE_SPACE;
@@ -282,6 +330,7 @@ HYPHEN              --
                return FIGURE_OPEN;
        }
 }
+
 <notes,figures>{
        {ALPHAWORD}     {
                return scan_bare_word (YYText ());
@@ -303,6 +352,10 @@ HYPHEN             --
                yylval.i = String_convert::dec2int (String (YYText ()));
                return UNSIGNED;
        }
+       {E_UNSIGNED}    {
+               yylval.i = String_convert::dec2int (String (YYText () +1));
+               return E_UNSIGNED;
+       }
 
        \" {
                start_quote ();
@@ -361,7 +414,7 @@ HYPHEN              --
                char c = s[s.length () - 1];
                if (c == '{' ||  c == '}') // brace open is for not confusing dumb tools.
                        here_input ().warning (
-                               _ ("Brace found at end of lyric. Did you forget a space?"));
+                               _ ("Brace found at end of lyric.  Did you forget a space?"));
                yylval.scm = scm_makfrom0str (s.to_str0 ());
 
 
@@ -398,6 +451,9 @@ HYPHEN              --
        \/\+ {
                return CHORD_BASS;
        }
+       \/  {
+               return CHORD_SLASH;
+       }
        \^  {
                return CHORD_CARET;
        }
@@ -406,9 +462,72 @@ HYPHEN             --
        }
 }
 
-<<EOF>> {
 
+<markup>{
+       \" {
+               start_quote ();
+       }
+       \< {
+               return '<';
+       }
+       \> {
+               return '>';
+       }
+       {MARKUPCOMMAND} {
+               String str (YYText() + 1);
+               SCM s = lookup_markup_command (str);
+
+               if (gh_pair_p (s) && gh_symbol_p (gh_cdr (s)) ) {
+                       yylval.scm = gh_car(s);
+                       SCM tag = gh_cdr(s);
+                       if (tag == ly_symbol2scm("markup0"))
+                               return MARKUP_HEAD_MARKUP0;
+                       if (tag == ly_symbol2scm("empty"))
+                               return MARKUP_HEAD_EMPTY;
+                       else if (tag == ly_symbol2scm ("markup0-markup1"))
+                               return MARKUP_HEAD_MARKUP0_MARKUP1;
+                       else if (tag == ly_symbol2scm ("markup-list0"))
+                               return MARKUP_HEAD_LIST0;
+                       else if (tag == ly_symbol2scm ("scheme0"))
+                               return MARKUP_HEAD_SCM0;
+                       else if (tag == ly_symbol2scm ("scheme0-scheme1"))
+                               return MARKUP_HEAD_SCM0_SCM1;
+                       else if (tag == ly_symbol2scm ("scheme0-markup1"))
+                               return MARKUP_HEAD_SCM0_MARKUP1;
+                       else if (tag == ly_symbol2scm ("scheme0-scheme1-markup2"))
+                               return MARKUP_HEAD_SCM0_SCM1_MARKUP2;
+                       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"); 
+                               ly_display_scm (s);
+                               assert(false);
+                       }
+               } else
+                       return scan_escaped_word (str);
+       }
+       [{}]    {
+               return YYText()[0];
+       }
+       [^#{}"\\ \t\n\r\f]+ {
+               String s (YYText ()); 
+
+               char c = s[s.length () - 1];
+               if (c == '{' ||  c == '}') // brace open is for not confusing dumb tools.
+                       here_input ().warning (
+                               _ ("Brace found at end of markup.  Did you forget a space?"));
+               yylval.scm = scm_makfrom0str (s.to_str0 ());
 
+
+               return STRING;
+       }
+       .  {
+               return YYText()[0];
+       }
+}
+
+<<EOF>> {
+       main_input_b_ = false;
        if (! close_input ()) { 
          yyterminate (); // can't move this, since it actually rets a YY_NULL
        }
@@ -435,6 +554,7 @@ HYPHEN              --
        return UNSIGNED;
 }
 
+
 [{}]   {
 
        return YYText ()[0];
@@ -471,6 +591,7 @@ HYPHEN              --
        return E_TILDE;
     case '\\':
        return E_BACKSLASH;
+
     default:
        return E_CHAR;
     }
@@ -485,8 +606,9 @@ HYPHEN              --
 %%
 
 void
-My_lily_lexer::push_note_state ()
+My_lily_lexer::push_note_state (SCM tab)
 {
+       pitchname_tab_stack_ = gh_cons (tab, pitchname_tab_stack_);
        yy_push_state (notes);
 }
 
@@ -496,8 +618,9 @@ My_lily_lexer::push_figuredbass_state()
        yy_push_state (figures);
 }
 void
-My_lily_lexer::push_chord_state ()
+My_lily_lexer::push_chord_state (SCM tab)
 {
+       pitchname_tab_stack_ = gh_cons (tab, pitchname_tab_stack_);
        yy_push_state (chords);
 }
 
@@ -507,62 +630,46 @@ My_lily_lexer::push_lyric_state ()
        yy_push_state (lyrics);
 }
 
+void
+My_lily_lexer::push_markup_state ()
+{
+       yy_push_state (markup);
+}
+
 void
 My_lily_lexer::pop_state ()
 {
+       if (YYSTATE == notes || YYSTATE == chords)
+               pitchname_tab_stack_ = gh_cdr (pitchname_tab_stack_);
        yy_pop_state ();
 }
 
+int
+My_lily_lexer::identifier_type(SCM sid)
+{
+       int k = try_special_identifiers(&yylval.scm , sid);
+       return k >= 0  ? k : SCM_IDENTIFIER;
+}
+
+
 int
 My_lily_lexer::scan_escaped_word (String str)
 {
        // use more SCM for this.
 
-       SCM sym = ly_symbol2scm (str.to_str0 ());
+//     SCM sym = ly_symbol2scm (str.to_str0 ());
 
        int l = lookup_keyword (str);
        if (l != -1) {
                return l;
        }
        SCM sid = lookup_identifier (str);
-       if (gh_string_p (sid)) {
-               yylval.scm = sid; 
-               return STRING_IDENTIFIER;
-       } else if (gh_number_p (sid)) {
-               yylval.scm = sid;
-               return NUMBER_IDENTIFIER;
-       } else if (unsmob_translator_def (sid)) {
-               yylval.scm = sid;
-               return TRANSLATOR_IDENTIFIER;
-       } else if (unsmob_score (sid)) {
-               yylval.scm =sid;
-               return SCORE_IDENTIFIER;
-       } else if (Music * mus =unsmob_music (sid)) {
-               yylval.scm = sid;
-               
-               return dynamic_cast<Request*> (mus) ? REQUEST_IDENTIFIER : MUSIC_IDENTIFIER;
-       } else if (unsmob_duration (sid)) {
-               yylval.scm = sid;
-               return DURATION_IDENTIFIER;
-       } else if (unsmob_music_output_def (sid)) {
-               yylval.scm = sid;
-               return MUSIC_OUTPUT_DEF_IDENTIFIER;
-       }
-
-       if (sid != SCM_UNDEFINED) {
+       if (sid != SCM_UNDEFINED)
+       {
                yylval.scm = sid;
-               return SCM_IDENTIFIER;
+               return identifier_type (sid);
        }
 
-       if ((YYSTATE != notes) && (YYSTATE != chords)) {
-               SCM pitch = scm_hashq_get_handle (pitchname_tab_, sym);
-               
-               if (gh_pair_p (pitch))
-               {
-                       yylval.scm = ly_cdr (pitch);
-                       return NOTENAME_PITCH;
-               }
-       }
        String msg (_f ("unknown escaped string: `\\%s'", str));        
        LexerError (msg.to_str0 ());
 
@@ -576,14 +683,21 @@ My_lily_lexer::scan_bare_word (String str)
 {
        SCM sym = ly_symbol2scm (str.to_str0 ());
        if ((YYSTATE == notes) || (YYSTATE == chords)) {
-               SCM pitch = scm_hashq_get_handle (pitchname_tab_, sym);
-               if (gh_pair_p (pitch)) {
-                   yylval.scm = ly_cdr (pitch);
-                    return (YYSTATE == notes) ? NOTENAME_PITCH : TONICNAME_PITCH;
-               } else if ((pitch = scm_hashq_get_handle (chordmodifier_tab_, sym))!= SCM_BOOL_F)
+               SCM handle = SCM_BOOL_F;
+               if (gh_pair_p (pitchname_tab_stack_))
+                       handle = scm_hashq_get_handle (gh_car (pitchname_tab_stack_), sym);
+               
+               if (gh_pair_p (handle)) {
+                       yylval.scm = ly_cdr (handle);
+                       if (unsmob_pitch (yylval.scm)) 
+                           return (YYSTATE == notes) ? NOTENAME_PITCH : TONICNAME_PITCH;
+                       else if (gh_symbol_p (yylval.scm))
+                           return DRUM_PITCH;
+               }
+               else if ((handle = scm_hashq_get_handle (chordmodifier_tab_, sym))!= SCM_BOOL_F)
                {
-                   yylval.scm = ly_cdr (pitch);
-                   return CHORDMODIFIER_PITCH;
+                   yylval.scm = ly_cdr (handle);
+                   return CHORD_MODIFIER;
                }
        }
 
@@ -643,8 +757,8 @@ strip_trailing_white (String&s)
 
 
 
-/* 1.3.146 == removal of ; */ 
-Lilypond_version oldest_version ("1.3.146");
+/* 1.9.0 == postfix articulations */ 
+Lilypond_version oldest_version ("1.9.0");
 
 
 bool
@@ -654,7 +768,7 @@ valid_version_b (String s)
   Lilypond_version ver (s);
   if (! ((ver >= oldest_version) && (ver <= current)))
        {       
-               non_fatal_error (_f ("Incorrect lilypond version: %s (%s, %s)", ver.string (), oldest_version.string (), current.string ()));
+               non_fatal_error (_f ("Incorrect lilypond version: %s (%s, %s)", ver.to_string (), oldest_version.to_string (), current.to_string ()));
                non_fatal_error (_ ("Consider updating the input with the convert-ly script")); 
                return false;
     }
@@ -662,6 +776,9 @@ valid_version_b (String s)
 }
        
 
+/*
+  substittute _ adn \,
+*/
 String
 lyric_fudge (String s)
 {
@@ -701,4 +818,33 @@ scan_fraction (String frac)
        int d = String_convert::dec2int (right);
        return gh_cons (gh_int2scm (n), gh_int2scm (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)
+{
+       static SCM proc ;
+       if (!proc)
+               proc = scm_c_eval_string ("lookup-markup-command");
+
+       return scm_call_1 (proc, scm_makfrom0str (s.to_str0 ()));
+}