X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flexer.ll;h=bca7f0a936b6f1db2a0fc3419de7bf77d38d6797;hb=bd24b8ad63e7825f8e85cf772cd1a17b2a99b9dc;hp=ea5ed739e491d5ddd6bc09801bdc6e500272ab53;hpb=51bd6a67ea8fe21034817a425dd376aadf59b157;p=lilypond.git diff --git a/lily/lexer.ll b/lily/lexer.ll index ea5ed739e4..bca7f0a936 100644 --- a/lily/lexer.ll +++ b/lily/lexer.ll @@ -4,7 +4,7 @@ source file of the LilyPond music typesetter - (c) 1996--2004 Han-Wen Nienhuys + (c) 1996--2005 Han-Wen Nienhuys Jan Nieuwenhuizen */ @@ -28,18 +28,20 @@ /* Flex >= 2.5.29 fix; FlexLexer.h's multiple include bracing breaks when building the actual lexer. */ + #define LEXER_CC #include + using namespace std; +#include "music-function.hh" #include "source-file.hh" #include "parse-scm.hh" #include "lily-guile.hh" #include "string.hh" #include "string-convert.hh" -#include "my-lily-lexer.hh" -#include "input-file-results.hh" +#include "lily-lexer.hh" #include "interval.hh" #include "lily-guile.hh" #include "parser.hh" @@ -58,22 +60,25 @@ RH 7 fix (?) void strip_trailing_white (String&); void strip_leading_white (String&); String lyric_fudge (String s); - -SCM -lookup_markup_command (String s); - -bool -is_valid_version (String s); - +int music_function_type (SCM); +SCM lookup_markup_command (String s); +bool is_valid_version (String s); #define start_quote() \ yy_push_state (quote);\ yylval.string = new String +#define start_lyric_quote() \ + yy_push_state (lyric_quote);\ + yylval.string = new String + #define yylval \ (*(YYSTYPE*)lexval) +#define yylloc \ + (*(YYLTYPE*)lexloc) + #define YY_USER_ACTION add_lexed_char (YYLeng ()); /* @@ -93,21 +98,22 @@ SCM (* scm_parse_error_handler) (void *); %option noyywrap %option nodefault %option debug -%option yyclass="My_lily_lexer" +%option yyclass="Lily_lexer" %option stack %option never-interactive %option warn -%x renameinput -%x version %x chords +%x figures %x incl %x lyrics +%x lyric_quote +%x longcomment +%x markup %x notes -%x figures %x quote -%x longcomment -%x markup +%x renameinput +%x version A [a-zA-Z] AA {A}|_ @@ -143,7 +149,7 @@ HYPHEN -- // windows-suck-suck-suck } -{ +{ "%{" { yy_push_state (longcomment); } @@ -167,32 +173,36 @@ HYPHEN -- yy_push_state (renameinput); } \"[^"]*\" { /* got the version number */ - String s (YYText ()+1); + String s (YYText () + 1); s = s.left_string (s.index_last ('\"')); - yy_pop_state(); - if (!is_valid_version (s)) + yy_pop_state (); + if (!is_valid_version (s)) return INVALID; + + SCM top_scope = scm_car (scm_last_pair (scopes_)); + scm_module_define (top_scope, ly_symbol2scm ("version-seen?"), SCM_BOOL_T); + } -\"[^"]*\" { /* got the version number */ - String s (YYText ()+1); +\"[^"]*\" { + 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'\n", s.to_str0())); - scm_module_define (gh_car (scopes_), + message (_f ("Renaming input to: `%s'", s.to_str0 ())); + progress_indication ("\n"); + scm_module_define (scm_car (scopes_), ly_symbol2scm ("input-file-name"), - scm_makfrom0str (s.to_str0())); + scm_makfrom0str (s.to_str0 ())); } - . { - LexerError ("No quoted string found after \\version"); + LexerError (_ ("quoted string expected after \\version").to_str0 ()); yy_pop_state (); } . { - LexerError ("No quoted string found after \\renameinput"); + LexerError (_ ("quoted string expected after \\renameinput").to_str0 ()); yy_pop_state (); } { @@ -206,7 +216,7 @@ HYPHEN -- } <> { LexerError (_ ("EOF found inside a comment").to_str0 ()); - main_input_b_ = false; + is_main_input_ = false; if (! close_input ()) yyterminate (); // can't move this, since it actually rets a YY_NULL } @@ -214,10 +224,10 @@ HYPHEN -- \\maininput { - if (!main_input_b_) + if (!is_main_input_) { start_main_input (); - main_input_b_ = true; + is_main_input_ = true; } else error (_ ("\\maininput not allowed outside init files")); @@ -226,22 +236,22 @@ HYPHEN -- \\include { yy_push_state (incl); } -\"[^"]*\";? { /* got the include file name */ +\"[^"]*\" { /* got the include file name */ String s (YYText ()+1); s = s.left_string (s.index_last ('"')); - new_input (s, &global_input_file->sources_); + new_input (s, sources_); yy_pop_state (); } -\\{BLACK}*;?{WHITE} { /* got the include identifier */ +\\{BLACK}*{WHITE} { /* got the include identifier */ String s = YYText () + 1; strip_trailing_white (s); if (s.length () && (s[s.length () - 1] == ';')) s = s.left_string (s.length () - 1); SCM sid = lookup_identifier (s); - if (gh_string_p (sid)) { - new_input (ly_scm2string (sid), &global_input_file->sources_); + if (scm_is_string (sid)) { + new_input (ly_scm2string (sid), sources_); yy_pop_state (); } else { String msg (_f ("wrong or undefined identifier: `%s'", s )); @@ -253,7 +263,7 @@ HYPHEN -- } } \"[^"]* { // backup rule - error (_ ("Missing end quote")); + error (_ ("end quote missing")); exit (1); } {RESTNAME} { @@ -264,39 +274,20 @@ HYPHEN -- R { return MULTI_MEASURE_REST; } -\\\${BLACK}*{WHITE} { - String s=YYText () + 2; - s=s.left_string (s.length () - 1); - return scan_escaped_word (s); -} -\${BLACK}*{WHITE} { - String s=YYText () + 1; - s=s.left_string (s.length () - 1); - return scan_bare_word (s); -} -\\\${BLACK}* { // backup rule - error (_("white expected")); - exit (1); -} -\${BLACK}* { // backup rule - error (_("white expected")); - exit (1); -} - -# { //embedded scm - //char const* s = YYText () + 1; - char const* s = here_str0 (); +# { //embedded scm int n = 0; - SCM sval = ly_parse_scm (s, &n, here_input (), - safe_global_b && main_input_b_); + Input hi = here_input(); + hi.step_forward (); + SCM sval = ly_parse_scm (hi.start_, &n, hi, + be_safe_global && is_main_input_); if (sval == SCM_UNDEFINED) { sval = SCM_UNSPECIFIED; - errorlevel_ = 1; + error_level_ = 1; } - for (int i=0; i < n; i++) + for (int i = 0; i < n; i++) { yyinput (); } @@ -313,10 +304,10 @@ HYPHEN -- } { \<\< { - return LESSLESS; + return DOUBLE_ANGLE_OPEN; } \>\> { - return MOREMORE; + return DOUBLE_ANGLE_CLOSE; } } { @@ -356,7 +347,6 @@ HYPHEN -- yylval.i = String_convert::dec2int (String (YYText () +1)); return E_UNSIGNED; } - \" { start_quote (); } @@ -386,10 +376,31 @@ HYPHEN -- *yylval.string += YYText (); } } +{ + \\{ESCAPED} { + *yylval.string += to_string (escaped_char (YYText ()[1])); + } + [^\\"]+ { + *yylval.string += YYText (); + } + \" { + + yy_pop_state (); + + /* yylval is union. Must remember STRING before setting SCM*/ + String *sp = yylval.string; + yylval.scm = scm_makfrom0str (sp->to_str0 ()); + delete sp; + return LYRICS_STRING; + } + . { + *yylval.string += YYText (); + } +} { \" { - start_quote (); + start_lyric_quote (); } {FRACTION} { yylval.scm = scan_fraction (YYText ()); @@ -418,7 +429,7 @@ HYPHEN -- yylval.scm = scm_makfrom0str (s.to_str0 ()); - return STRING; + return LYRICS_STRING; } . { return YYText ()[0]; @@ -467,19 +478,16 @@ HYPHEN -- \" { start_quote (); } - \< { - return '<'; - } - \> { - return '>'; + \\score { + return SCORE; } {MARKUPCOMMAND} { - String str (YYText() + 1); + 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 (scm_is_pair (s) && scm_is_symbol (scm_cdr (s)) ) { + yylval.scm = scm_car(s); + SCM tag = scm_cdr(s); if (tag == ly_symbol2scm("markup0")) return MARKUP_HEAD_MARKUP0; if (tag == ly_symbol2scm("empty")) @@ -499,7 +507,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 signature"); ly_display_scm (s); assert(false); } @@ -507,13 +515,14 @@ HYPHEN -- return scan_escaped_word (str); } [{}] { - return YYText()[0]; + 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. + /* brace open is for not confusing dumb tools. */ + if (c == '{' || c == '}') here_input ().warning ( _ ("Brace found at end of markup. Did you forget a space?")); yylval.scm = scm_makfrom0str (s.to_str0 ()); @@ -527,10 +536,16 @@ HYPHEN -- } <> { - main_input_b_ = false; - if (! close_input ()) { - yyterminate (); // can't move this, since it actually rets a YY_NULL + if (is_main_input_) + { + is_main_input_ = false; + if (!close_input ()) + /* Returns YY_NULL */ + yyterminate (); } + else if (!close_input ()) + /* Returns YY_NULL */ + yyterminate (); } @@ -542,10 +557,10 @@ HYPHEN -- } {REAL} { Real r; - int cnv=sscanf (YYText (), "%lf", &r); + int cnv = sscanf (YYText (), "%lf", &r); assert (cnv == 1); - yylval.scm = gh_double2scm (r); + yylval.scm = scm_make_real (r); return REAL; } @@ -570,13 +585,13 @@ HYPHEN -- } \\. { - char c= YYText ()[1]; + char c = YYText ()[1]; switch (c) { case '>': - return E_BIGGER; + return E_ANGLE_CLOSE; case '<': - return E_SMALLER; + return E_ANGLE_OPEN; case '!': return E_EXCLAMATION; case '(': @@ -584,9 +599,9 @@ HYPHEN -- case ')': return E_CLOSE; case '[': - return E_LEFTSQUARE; + return E_BRACKET_OPEN; case ']': - return E_RIGHTSQUARE; + return E_BRACKET_CLOSE; case '~': return E_TILDE; case '\\': @@ -606,46 +621,53 @@ HYPHEN -- %% void -My_lily_lexer::push_note_state (SCM tab) +Lily_lexer::push_chord_state (SCM tab) { - pitchname_tab_stack_ = gh_cons (tab, pitchname_tab_stack_); - yy_push_state (notes); + pitchname_tab_stack_ = scm_cons (tab, pitchname_tab_stack_); + yy_push_state (chords); } void -My_lily_lexer::push_figuredbass_state() +Lily_lexer::push_figuredbass_state () { yy_push_state (figures); } + void -My_lily_lexer::push_chord_state (SCM tab) +Lily_lexer::push_initial_state () { - pitchname_tab_stack_ = gh_cons (tab, pitchname_tab_stack_); - yy_push_state (chords); + yy_push_state (INITIAL); } void -My_lily_lexer::push_lyric_state () +Lily_lexer::push_lyric_state () { yy_push_state (lyrics); } void -My_lily_lexer::push_markup_state () +Lily_lexer::push_markup_state () { yy_push_state (markup); } void -My_lily_lexer::pop_state () +Lily_lexer::push_note_state (SCM tab) +{ + pitchname_tab_stack_ = scm_cons (tab, pitchname_tab_stack_); + yy_push_state (notes); +} + +void +Lily_lexer::pop_state () { if (YYSTATE == notes || YYSTATE == chords) - pitchname_tab_stack_ = gh_cdr (pitchname_tab_stack_); + pitchname_tab_stack_ = scm_cdr (pitchname_tab_stack_); yy_pop_state (); } int -My_lily_lexer::identifier_type (SCM sid) +Lily_lexer::identifier_type (SCM sid) { int k = try_special_identifiers (&yylval.scm , sid); return k >= 0 ? k : SCM_IDENTIFIER; @@ -653,17 +675,25 @@ My_lily_lexer::identifier_type (SCM sid) int -My_lily_lexer::scan_escaped_word (String str) +Lily_lexer::scan_escaped_word (String str) { // use more SCM for this. // 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); + } + if (sid != SCM_UNDEFINED) { yylval.scm = sid; @@ -679,24 +709,24 @@ My_lily_lexer::scan_escaped_word (String str) } int -My_lily_lexer::scan_bare_word (String str) +Lily_lexer::scan_bare_word (String str) { SCM sym = ly_symbol2scm (str.to_str0 ()); if ((YYSTATE == notes) || (YYSTATE == chords)) { SCM handle = SCM_BOOL_F; - if (gh_pair_p (pitchname_tab_stack_)) - handle = scm_hashq_get_handle (gh_car (pitchname_tab_stack_), sym); + if (scm_is_pair (pitchname_tab_stack_)) + handle = scm_hashq_get_handle (scm_car (pitchname_tab_stack_), sym); - if (gh_pair_p (handle)) { - yylval.scm = ly_cdr (handle); + if (scm_is_pair (handle)) { + yylval.scm = scm_cdr (handle); if (unsmob_pitch (yylval.scm)) return (YYSTATE == notes) ? NOTENAME_PITCH : TONICNAME_PITCH; - else if (gh_symbol_p (yylval.scm)) + else if (scm_is_symbol (yylval.scm)) return DRUM_PITCH; } else if ((handle = scm_hashq_get_handle (chordmodifier_tab_, sym))!= SCM_BOOL_F) { - yylval.scm = ly_cdr (handle); + yylval.scm = scm_cdr (handle); return CHORD_MODIFIER; } } @@ -706,25 +736,25 @@ My_lily_lexer::scan_bare_word (String str) } bool -My_lily_lexer::is_note_state () const +Lily_lexer::is_note_state () const { return YY_START == notes; } bool -My_lily_lexer::is_chord_state () const +Lily_lexer::is_chord_state () const { return YY_START == chords; } bool -My_lily_lexer::is_lyric_state () const +Lily_lexer::is_lyric_state () const { return YY_START == lyrics; } bool -My_lily_lexer::is_figure_state () const +Lily_lexer::is_figure_state () const { return YY_START == figures; } @@ -736,7 +766,7 @@ My_lily_lexer::is_figure_state () const void strip_leading_white (String&s) { - int i=0; + int i = 0; for (; i < s.length (); i++) if (!isspace (s[i])) break; @@ -747,7 +777,7 @@ strip_leading_white (String&s) void strip_trailing_white (String&s) { - int i=s.length (); + int i = s.length (); while (i--) if (!isspace (s[i])) break; @@ -757,8 +787,8 @@ strip_trailing_white (String&s) -/* 1.9.0 == postfix articulations */ -Lilypond_version oldest_version ("1.9.0"); +/* 2.1.2x something -> \property -> \set. */ +Lilypond_version oldest_version ("2.3.22"); bool @@ -782,7 +812,7 @@ is_valid_version (String s) String lyric_fudge (String s) { - char * chars =s.get_copy_str0 (); + char * chars = s.get_copy_str0 (); for (char * p = chars; *p ; p++) { @@ -793,8 +823,8 @@ lyric_fudge (String s) s = String (chars); delete[] chars; - int i =0; - if ((i=s.index ("\\,")) != -1) // change "\," to TeX's "\c " + int i = 0; + if ((i = s.index ("\\,")) != -1) // change "\," to TeX's "\c " { * (s.get_str0 () + i + 1) = 'c'; s = s.left_string (i+2) + " " + s.right_string (s.length ()-i-2); @@ -816,7 +846,7 @@ scan_fraction (String frac) int n = String_convert::dec2int (left); int d = String_convert::dec2int (right); - return gh_cons (gh_int2scm (n), gh_int2scm (d)); + return scm_cons (scm_int2num (n), scm_int2num (d)); } // Breaks for flex 2.5.31 @@ -842,9 +872,72 @@ avoid_silly_flex_induced_gcc_warnings () SCM lookup_markup_command (String s) { - static SCM proc ; - if (!proc) - proc = scm_c_eval_string ("lookup-markup-command"); - + SCM proc = ly_lily_module_constant ("lookup-markup-command"); return scm_call_1 (proc, scm_makfrom0str (s.to_str0 ())); } + + +int +music_function_type (SCM func) +{ + SCM type = scm_object_property (func, ly_symbol2scm ("music-function-signature-keyword")); + if (type == ly_symbol2scm ("scm")) + { + return MUSIC_FUNCTION_SCM; + } + else if (type == ly_symbol2scm ("music")) + { + return MUSIC_FUNCTION_MUSIC; + } + else if (type == ly_symbol2scm ("scm-music")) + { + return MUSIC_FUNCTION_SCM_MUSIC; + } + else if (type == ly_symbol2scm ("scm-scm")) + { + return MUSIC_FUNCTION_SCM_SCM; + } + else if (type == ly_symbol2scm ("music-music")) + { + return MUSIC_FUNCTION_MUSIC_MUSIC; + } + else if (type == ly_symbol2scm ("scm-music-music")) + { + return MUSIC_FUNCTION_SCM_MUSIC_MUSIC; + } + else if (type == ly_symbol2scm ("scm-scm-music")) + { + return MUSIC_FUNCTION_SCM_SCM_MUSIC; + } + else if (type == ly_symbol2scm ("markup")) + { + return MUSIC_FUNCTION_MARKUP; + } + else if (type == ly_symbol2scm ("markup-music")) + { + return MUSIC_FUNCTION_MARKUP_MUSIC; + } + else if (type == ly_symbol2scm ("markup-markup")) + { + return MUSIC_FUNCTION_MARKUP_MARKUP; + } + else if (type == ly_symbol2scm ("markup-music-music")) + { + return MUSIC_FUNCTION_MARKUP_MUSIC_MUSIC; + } + else if (type == ly_symbol2scm ("markup-markup-music")) + { + return MUSIC_FUNCTION_MARKUP_MARKUP_MUSIC; + } + else if (type == ly_symbol2scm ("noarg")) + { + return MUSIC_FUNCTION; + } + else + { + /* TODO: print location */ + error (_ ("can't find signature for music function")); + } + + return MUSIC_FUNCTION_SCM; +}