X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flexer.ll;h=b8a502edc127113667e558202797cd6ebd2ab10a;hb=664070d837cc4855091455892cb942cdcedeef0c;hp=de7da4965861615dcf4eb7e7e8dc7dad0f0ed1d9;hpb=285afa80427ca7c750bbf0a605914196769e1774;p=lilypond.git diff --git a/lily/lexer.ll b/lily/lexer.ll index de7da49658..b8a502edc1 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--2002 Han-Wen Nienhuys + (c) 1996--2004 Han-Wen Nienhuys Jan Nieuwenhuizen */ @@ -26,14 +26,19 @@ #include #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 "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 "interval.hh" #include "lily-guile.hh" #include "parser.hh" @@ -41,7 +46,7 @@ #include "main.hh" #include "version.hh" #include "lilypond-input-version.hh" -#include "translator-def.hh" +#include "context-def.hh" #include "identifier-smob.hh" /* @@ -52,17 +57,19 @@ RH 7 fix (?) void strip_trailing_white (String&); void strip_leading_white (String&); String lyric_fudge (String s); - - -bool -valid_version_b (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) @@ -78,6 +85,7 @@ SCM scan_fraction (String); SCM (* scm_parse_error_handler) (void *); + %} %option c++ @@ -89,15 +97,18 @@ SCM (* scm_parse_error_handler) (void *); %option never-interactive %option warn -%x version %x chords +%x encoding +%x figures %x incl %x lyrics +%x lyric_quote +%x longcomment +%x markup %x notes -%x figures %x quote -%x longcomment - +%x renameinput +%x version A [a-zA-Z] AA {A}|_ @@ -121,7 +132,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 -- @@ -132,36 +144,70 @@ 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}+ { } } +\\encoding{WHITE}* { + yy_push_state (encoding); +} \\version{WHITE}* { yy_push_state (version); } +\\renameinput{WHITE}* { + yy_push_state (renameinput); +} +\"[^"]*\" { + String s (YYText () + 1); + s = s.left_string (s.index_last ('\"')); + set_encoding (s); + yy_pop_state (); +} \"[^"]*\" { /* got the version number */ - String s (YYText ()+1); + String s (YYText () + 1); s = s.left_string (s.index_last ('\"')); yy_pop_state (); - if (!valid_version_b (s)) + if (!is_valid_version (s)) return INVALID; } +\"[^"]*\" { + String s (YYText ()+1); + s = s.left_string (s.index_last ('\"')); + + yy_pop_state(); + this->here_input().source_file_->name_ = s; + progress_indication ("\n"); + progress_indication (_f ("input renamed to: `%s'", s.to_str0 ())); + progress_indication ("\n"); + scm_module_define (ly_car (scopes_), + ly_symbol2scm ("input-file-name"), + scm_makfrom0str (s.to_str0())); + +} +. { + LexerError (_ ("No quoted string found after \\encoding").to_str0 ()); + yy_pop_state (); +} . { - LexerError ("No quoted string found after \\version"); + LexerError (_ ("No quoted string found after \\version").to_str0 ()); + yy_pop_state (); +} +. { + LexerError (_ ("No quoted string found after \\renameinput").to_str0 ()); yy_pop_state (); } { @@ -175,6 +221,7 @@ HYPHEN -- } <> { 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 } @@ -186,30 +233,34 @@ HYPHEN -- { start_main_input (); main_input_b_ = true; + SCM nn = lookup_identifier ("pitchnames"); + push_note_state (alist_to_hashq (nn)); } else - error (_ ("\\maininput disallowed outside init files")); + error (_ ("\\maininput not allowed outside init files")); } \\include { yy_push_state (incl); } \"[^"]*\";? { /* got the include file name */ +/* FIXME: semicolon? */ 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 */ +/* FIXME: semicolon? */ 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 (ly_c_string_p (sid)) { + new_input (ly_scm2string (sid), sources_); yy_pop_state (); } else { String msg (_f ("wrong or undefined identifier: `%s'", s )); @@ -232,35 +283,18 @@ 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 +# { //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; - } - SCM sval = 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; + error_level_ = 1; + } for (int i=0; i < n; i++) { @@ -277,12 +311,12 @@ HYPHEN -- yylval.scm = sval; return SCM_T; } -{ +{ \<\< { - return CHORD_OPEN; + return DOUBLE_ANGLE_OPEN; } \>\> { - return CHORD_CLOSE; + return DOUBLE_ANGLE_CLOSE; } } { @@ -352,10 +386,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 ()); @@ -384,7 +439,7 @@ HYPHEN -- yylval.scm = scm_makfrom0str (s.to_str0 ()); - return STRING; + return LYRICS_STRING; } . { return YYText ()[0]; @@ -429,14 +484,81 @@ HYPHEN -- } +{ + \" { + start_quote (); + } + \< { + return '<'; + } + \> { + return '>'; + } + {MARKUPCOMMAND} { + String str (YYText () + 1); + SCM s = lookup_markup_command (str); + + if (ly_c_pair_p (s) && ly_c_symbol_p (ly_cdr (s)) ) { + yylval.scm = ly_car(s); + SCM tag = ly_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]; + /* 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 ()); -<> { + return STRING; + } + . { + return YYText()[0]; + } +} - if (! close_input ()) { - yyterminate (); // can't move this, since it actually rets a YY_NULL +<> { + if (main_input_b_) + { + main_input_b_ = false; + if (!close_input ()) + /* Returns YY_NULL */ + yyterminate (); } + else if (!close_input ()) + /* Returns YY_NULL */ + yyterminate (); } @@ -451,7 +573,7 @@ HYPHEN -- int cnv=sscanf (YYText (), "%lf", &r); assert (cnv == 1); - yylval.scm = gh_double2scm (r); + yylval.scm = scm_make_real (r); return REAL; } @@ -512,20 +634,22 @@ HYPHEN -- %% void -My_lily_lexer::push_note_state () +My_lily_lexer::push_chord_state (SCM tab) { - yy_push_state (notes); + pitchname_tab_stack_ = scm_cons (tab, pitchname_tab_stack_); + yy_push_state (chords); } void -My_lily_lexer::push_figuredbass_state() +My_lily_lexer::push_figuredbass_state () { yy_push_state (figures); } + void -My_lily_lexer::push_chord_state () +My_lily_lexer::push_initial_state () { - yy_push_state (chords); + yy_push_state (INITIAL); } void @@ -534,16 +658,31 @@ 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::push_note_state (SCM tab) +{ + pitchname_tab_stack_ = scm_cons (tab, pitchname_tab_stack_); + yy_push_state (notes); +} + void My_lily_lexer::pop_state () { + if (YYSTATE == notes || YYSTATE == chords) + pitchname_tab_stack_ = ly_cdr (pitchname_tab_stack_); yy_pop_state (); } int -My_lily_lexer::identifier_type(SCM sid) +My_lily_lexer::identifier_type (SCM sid) { - int k = try_special_identifiers(&yylval.scm , sid); + int k = try_special_identifiers (&yylval.scm , sid); return k >= 0 ? k : SCM_IDENTIFIER; } @@ -553,28 +692,26 @@ 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 (is_music_function (sid)) + { + yylval.scm = get_music_function_transform (sid); + + return music_function_type (yylval.scm); + } + if (sid != SCM_UNDEFINED) { yylval.scm = sid; 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 ()); @@ -588,14 +725,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 (ly_c_pair_p (pitchname_tab_stack_)) + handle = scm_hashq_get_handle (ly_car (pitchname_tab_stack_), sym); + + if (ly_c_pair_p (handle)) { + yylval.scm = ly_cdr (handle); + if (unsmob_pitch (yylval.scm)) + return (YYSTATE == notes) ? NOTENAME_PITCH : TONICNAME_PITCH; + else if (ly_c_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; } } @@ -604,25 +748,25 @@ My_lily_lexer::scan_bare_word (String str) } bool -My_lily_lexer::note_state_b () const +My_lily_lexer::is_note_state () const { return YY_START == notes; } bool -My_lily_lexer::chord_state_b () const +My_lily_lexer::is_chord_state () const { return YY_START == chords; } bool -My_lily_lexer::lyric_state_b () const +My_lily_lexer::is_lyric_state () const { return YY_START == lyrics; } bool -My_lily_lexer::figure_state_b () const +My_lily_lexer::is_figure_state () const { return YY_START == figures; } @@ -655,18 +799,18 @@ strip_trailing_white (String&s) -/* 1.3.146 == removal of ; */ -Lilypond_version oldest_version ("1.3.146"); +/* 2.1.2x something -> \property -> \set. */ +Lilypond_version oldest_version ("2.2.0"); bool -valid_version_b (String s) +is_valid_version (String s) { Lilypond_version current ( MAJOR_VERSION "." MINOR_VERSION "." PATCH_LEVEL ); 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; } @@ -674,6 +818,9 @@ valid_version_b (String s) } +/* + substitute _ and \, +*/ String lyric_fudge (String s) { @@ -711,9 +858,11 @@ 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 +#if 0 /* avoid silly flex induced gcc warnings */ static void yy_push_state (int) {;} static void yy_pop_state () {;} @@ -730,3 +879,53 @@ avoid_silly_flex_induced_gcc_warnings () yy_top_state (); avoid_silly_flex_induced_gcc_warnings (); } +#endif + +SCM +lookup_markup_command (String s) +{ + SCM proc = ly_scheme_function ("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 ("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 ("noarg")) + { + return MUSIC_FUNCTION; + } + else + { + /* TODO: print location */ + error ("Can not find sigature for music function."); + } + + return MUSIC_FUNCTION_SCM; +}