X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flexer.ll;h=c658e7bf8acfe3de6b2fe13fa4292239840dfe8b;hb=6f5b694886301a2facf7293d9f70cf41232103a6;hp=48d8c3564048cdac9e594947b7161ebfac8c5bd8;hpb=d765f3af45be51f15da55cf570a4b172200e1035;p=lilypond.git diff --git a/lily/lexer.ll b/lily/lexer.ll index 48d8c35640..c658e7bf8a 100644 --- a/lily/lexer.ll +++ b/lily/lexer.ll @@ -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 + (c) 1996--2003 Han-Wen Nienhuys Jan Nieuwenhuizen */ @@ -26,10 +26,15 @@ #include #include +/* 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 "source-file.hh" #include "parse-scm.hh" -#include "score.hh" #include "lily-guile.hh" #include "string.hh" #include "string-convert.hh" @@ -40,11 +45,10 @@ #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 "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}|_ @@ -123,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 -- @@ -134,17 +143,17 @@ HYPHEN -- // windows-suck-suck-suck } -{ +{ "%{" { yy_push_state (longcomment); } - %[^{\n].*\n { + %[^{\n\r].*[\n\r] { } - %[^{\n] { // backup rule + %[^{\n\r] { // backup rule } - %\n { + %[\n\r] { } - %[^{\n].* { + %[^{\n\r].* { } {WHITE}+ { @@ -154,18 +163,37 @@ HYPHEN -- \\version{WHITE}* { yy_push_state (version); } +\\renameinput{WHITE}* { + yy_push_state (renameinput); +} \"[^"]*\" { /* 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; } +\"[^"]*\" { /* 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; + scm_module_define (gh_car (scopes_), + ly_symbol2scm ("input-file-name"), + scm_makfrom0str (s.to_str0())); + +} + . { LexerError ("No quoted string found after \\version"); yy_pop_state (); } +. { + LexerError ("No quoted string found after \\renameinput"); + yy_pop_state (); +} { [^\%]* { } @@ -253,7 +281,7 @@ HYPHEN -- exit (1); } -# { //embedded scm +# { //embedded scm //char const* s = YYText () + 1; char const* s = here_str0 (); int n = 0; @@ -262,16 +290,36 @@ HYPHEN -- 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()); + 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; } +{ + \<\< { + return LESSLESS; + } + \>\> { + return MOREMORE; + } +} { _ { return FIGURE_SPACE; @@ -283,6 +331,7 @@ HYPHEN -- return FIGURE_OPEN; } } + { {ALPHAWORD} { return scan_bare_word (YYText ()); @@ -414,6 +463,68 @@ HYPHEN -- } } + +{ + \" { + 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; + 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]; + } +} + <> { @@ -517,12 +628,26 @@ 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 () { 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) { @@ -535,33 +660,10 @@ My_lily_lexer::scan_escaped_word (String str) 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 (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)) { @@ -593,7 +695,7 @@ My_lily_lexer::scan_bare_word (String str) } else if ((pitch = scm_hashq_get_handle (chordmodifier_tab_, sym))!= SCM_BOOL_F) { yylval.scm = ly_cdr (pitch); - return CHORDMODIFIER_PITCH; + return CHORD_MODIFIER; } } @@ -653,8 +755,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 @@ -664,7 +766,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; } @@ -672,6 +774,9 @@ valid_version_b (String s) } +/* + substittute _ adn \, +*/ String lyric_fudge (String s) { @@ -711,4 +816,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 ())); +}