X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flexer.ll;h=e07648fc32acefee31c836a4823fc618abf50b66;hb=11591464d14470386146df7a4c33998b53dbd35c;hp=dfbdfd9a3629f79b452a19c79a9acd0a28b80bf3;hpb=03311c038c913d96eb7ed0a896e2c7d8f4815e17;p=lilypond.git diff --git a/lily/lexer.ll b/lily/lexer.ll index dfbdfd9a36..e07648fc32 100644 --- a/lily/lexer.ll +++ b/lily/lexer.ll @@ -18,13 +18,17 @@ lex.backup contains no backup states, but only the reminder Compressed tables always back up. - (don-t forget to rm lex.yy.cc :-) + (don-t forget to rm lex.yy.cc :-) */ #include #include +#include /* gcc 3.0 */ +#include + +#include "score.hh" #include "lily-guile.hh" #include "string.hh" #include "string-convert.hh" @@ -36,13 +40,19 @@ #include "debug.hh" #include "main.hh" #include "musical-request.hh" -#include "identifier.hh" #include "version.hh" -#include "mudela-version.hh" +#include "lilypond-input-version.hh" #include "translator-def.hh" +#include "music-output-def.hh" + +/* +RH 7 fix (?) +*/ +#define isatty HORRIBLEKLUDGE void strip_trailing_white (String&); void strip_leading_white (String&); +String lyric_fudge (String s); bool @@ -54,7 +64,8 @@ valid_version_b (String s); yy_push_state (quote);\ yylval.string = new String -#define yylval (*(YYSTYPE*)lexval_l) +#define yylval \ + (*(YYSTYPE*)lexval_l) #define YY_USER_ACTION add_lexed_char (YYLeng ()); /* @@ -63,6 +74,9 @@ LYRICS ({AA}|{TEX})[^0-9 \t\n\f]* */ + +SCM scan_fraction (String); + %} %option c++ @@ -79,6 +93,7 @@ LYRICS ({AA}|{TEX})[^0-9 \t\n\f]* %x incl %x lyrics %x notes +%x figures %x quote %x longcomment @@ -87,14 +102,15 @@ A [a-zA-Z] AA {A}|_ N [0-9] AN {AA}|{N} -PUNCT [?!:'] +PUNCT [?!:'`] ACCENT \\[`'"^] -NATIONAL [\001-\006\021-\027\031\036\200-\377] +NATIONAL [\001-\006\021-\027\031\036\200-\377] TEX {AA}|-|{PUNCT}|{ACCENT}|{NATIONAL} WORD {A}{AN}* ALPHAWORD {A}+ DIGIT {N} UNSIGNED {N}+ +FRACTION {N}+\/{N}+ INT -?{UNSIGNED} REAL ({INT}\.{N}*)|(-?\.{N}+) KEYWORD \\{WORD} @@ -114,7 +130,7 @@ HYPHEN -- // windows-suck-suck-suck } -{ +{ "%{" { yy_push_state (longcomment); } @@ -131,13 +147,13 @@ HYPHEN -- } } -\\version{WHITE}* { +\\version{WHITE}* { yy_push_state (version); } -\"[^"]*\";? { /* got the include file name */ +\"[^"]*\" { /* got the version number */ String s (YYText ()+1); s = s.left_str (s.index_last_i ('"')); - DEBUG_OUT << "#version `" << s << "'\n"; + yy_pop_state (); if (!valid_version_b (s)) return INVALID; @@ -163,7 +179,7 @@ HYPHEN -- } -\\maininput { +\\maininput { if (!main_input_b_) { start_main_input (); @@ -173,13 +189,13 @@ HYPHEN -- error (_ ("\\maininput disallowed outside init files")); } -\\include { +\\include { yy_push_state (incl); } \"[^"]*\";? { /* got the include file name */ String s (YYText ()+1); s = s.left_str (s.index_last_i ('"')); - DEBUG_OUT << "#include `" << s << "'\n"; + new_input (s,source_global_l); yy_pop_state (); } @@ -188,47 +204,52 @@ HYPHEN -- strip_trailing_white (s); if (s.length_i () && (s[s.length_i () - 1] == ';')) s = s.left_str (s.length_i () - 1); - DEBUG_OUT << "#include `\\" << s << "'\n"; + SCM sid = lookup_identifier (s); if (gh_string_p (sid)) { new_input (ly_scm2string (sid), source_global_l); yy_pop_state (); } else { - String msg (_f ("wrong or undefined identifier: `%s'", s )); + String msg (_f ("wrong or undefined identifier: `%s'", s )); + LexerError (msg.ch_C ()); + SCM err = scm_current_error_port (); + scm_puts ("This value was found in the table: ", err); + scm_display (sid, err); } } \"[^"]* { // backup rule cerr << _ ("Missing end quote") << endl; exit (1); } -{RESTNAME} { +{RESTNAME} { const char *s = YYText (); yylval.scm = ly_str02scm (s); return RESTNAME; } -R { - return MEASURES; +R { + return MULTI_MEASURE_REST; } -\\\${BLACK}*{WHITE} { +\\\${BLACK}*{WHITE} { String s=YYText () + 2; s=s.left_str (s.length_i () - 1); return scan_escaped_word (s); } -\${BLACK}*{WHITE} { +\${BLACK}*{WHITE} { String s=YYText () + 1; s=s.left_str (s.length_i () - 1); return scan_bare_word (s); } -\\\${BLACK}* { // backup rule +\\\${BLACK}* { // backup rule cerr << _ ("white expected") << endl; exit (1); } -\${BLACK}* { // backup rule +\${BLACK}* { // backup rule cerr << _ ("white expected") << endl; exit (1); } -# { //embedded scm + +# { //embedded scm //char const* s = YYText () + 1; char const* s = here_ch_C (); int n = 0; @@ -238,9 +259,6 @@ HYPHEN -- return SCM_T; } yylval.scm = ly_parse_scm (s, &n); - DEBUG_OUT << "Scheme: "; - if (flower_dstream) - ly_display_scm (yylval.scm); for (int i=0; i < n; i++) { @@ -250,7 +268,15 @@ HYPHEN -- return SCM_T; } -{ +{ + \> { + return FIGURE_CLOSE; + } + \< { + return FIGURE_OPEN; + } +} +{ {ALPHAWORD} { return scan_bare_word (YYText ()); } @@ -258,6 +284,10 @@ HYPHEN -- {NOTECOMMAND} { return scan_escaped_word (YYText () + 1); } + {FRACTION} { + yylval.scm = scan_fraction (YYText ()); + return FRACTION; + } {DIGIT} { yylval.i = String_convert::dec2_i (String (YYText ())); @@ -278,18 +308,18 @@ HYPHEN -- } { \\{ESCAPED} { - *yylval.string += to_str (escaped_char(YYText()[1])); + *yylval.string += to_str (escaped_char (YYText ()[1])); } [^\\"]+ { *yylval.string += YYText (); } \" { - DEBUG_OUT << "quoted string: `" << *yylval.string << "'\n"; + yy_pop_state (); /* yylval is union. Must remember STRING before setting SCM*/ String *sp = yylval.string; - yylval.scm = ly_str02scm (sp->ch_C ()); + yylval.scm = ly_str02scm (sp->ch_C ()); delete sp; return STRING; } @@ -302,6 +332,10 @@ HYPHEN -- \" { start_quote (); } + {FRACTION} { + yylval.scm = scan_fraction (YYText ()); + return FRACTION; + } {UNSIGNED} { yylval.i = String_convert::dec2_i (String (YYText ())); return UNSIGNED; @@ -316,22 +350,15 @@ HYPHEN -- return yylval.i = EXTENDER; if (s == "--") return yylval.i = HYPHEN; - int i = 0; - while ((i=s.index_i ("_")) != -1) // change word binding "_" to " " - *(s.ch_l () + i) = ' '; - if ((i=s.index_i ("\\,")) != -1) // change "\," to TeX's "\c " - { - *(s.ch_l () + i + 1) = 'c'; - s = s.left_str (i+2) + " " + s.right_str (s.length_i ()-i-2); - } + s = lyric_fudge (s); char c = s[s.length_i () - 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 = ly_str02scm (s.ch_C ()); - DEBUG_OUT << "lyric : `" << s << "'\n"; + return STRING; } . { @@ -345,6 +372,10 @@ HYPHEN -- {NOTECOMMAND} { return scan_escaped_word (YYText () + 1); } + {FRACTION} { + yylval.scm = scan_fraction (YYText ()); + return FRACTION; + } {UNSIGNED} { yylval.i = String_convert::dec2_i (String (YYText ())); return UNSIGNED; @@ -370,7 +401,7 @@ HYPHEN -- } <> { - DEBUG_OUT << "<>"; + if (! close_input ()) { yyterminate (); // can't move this, since it actually rets a YY_NULL @@ -388,8 +419,8 @@ HYPHEN -- Real r; int cnv=sscanf (YYText (), "%lf", &r); assert (cnv == 1); - DEBUG_OUT << "REAL" << r<<'\n'; - yylval.real = r; + + yylval.scm = gh_double2scm (r); return REAL; } @@ -400,20 +431,19 @@ HYPHEN -- [{}] { - DEBUG_OUT << "parens\n"; return YYText ()[0]; } [*:=] { char c = YYText ()[0]; - DEBUG_OUT << "misc char" <. { +. { return YYText ()[0]; } -\\. { +\\. { char c= YYText ()[1]; switch (c) { @@ -423,6 +453,12 @@ HYPHEN -- return E_SMALLER; case '!': return E_EXCLAMATION; + case '(': + return E_OPEN; + case ')': + return E_CLOSE; + case '~': + return E_TILDE; default: return E_CHAR; } @@ -442,6 +478,11 @@ My_lily_lexer::push_note_state () yy_push_state (notes); } +void +My_lily_lexer::push_figuredbass_state() +{ + yy_push_state (figures); +} void My_lily_lexer::push_chord_state () { @@ -465,7 +506,7 @@ My_lily_lexer::scan_escaped_word (String str) { // use more SCM for this. - SCM sym = ly_symbol2scm (str.ch_C()); + SCM sym = ly_symbol2scm (str.ch_C ()); int l = lookup_keyword (str); if (l != -1) { @@ -478,41 +519,42 @@ My_lily_lexer::scan_escaped_word (String str) } else if (gh_number_p (sid)) { yylval.scm = sid; return NUMBER_IDENTIFIER; - } else if (Translator_def* tr = unsmob_translator_def (sid)) { + } 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; } - - - Identifier * id = unsmob_identifier (sid); - if (id) { - yylval.id = id; - return id->token_code_i_; - } else if (sid != SCM_UNDEFINED) { + if (sid != SCM_UNDEFINED) { yylval.scm = sid; return SCM_IDENTIFIER; } if ((YYSTATE != notes) && (YYSTATE != chords)) { - SCM pitch = scm_hashq_ref (pitchname_tab_, sym, SCM_BOOL_F); + SCM pitch = scm_hashq_get_handle (pitchname_tab_, sym); - if (pitch != SCM_BOOL_F) + if (gh_pair_p (pitch)) { - yylval.pitch = new Musical_pitch (pitch); - yylval.pitch->set_spot (Input (source_file_l (), - here_ch_C ())); + yylval.scm = ly_cdr (pitch); return NOTENAME_PITCH; } } String msg (_f ("unknown escaped string: `\\%s'", str)); LexerError (msg.ch_C ()); - yylval.scm = ly_str02scm(str.ch_C()); + yylval.scm = ly_str02scm (str.ch_C ()); return STRING; } @@ -522,22 +564,18 @@ My_lily_lexer::scan_bare_word (String str) { SCM sym = ly_symbol2scm (str.ch_C ()); if ((YYSTATE == notes) || (YYSTATE == chords)) { - SCM pitch = scm_hashq_ref (pitchname_tab_, sym, SCM_BOOL_F); - if (pitch != SCM_BOOL_F) { - yylval.pitch = new Musical_pitch (pitch); - yylval.pitch->set_spot (Input (source_file_l (), - here_ch_C ())); + 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_ref (chordmodifier_tab_, sym, SCM_BOOL_F))!= SCM_BOOL_F) + } else if ((pitch = scm_hashq_get_handle (chordmodifier_tab_, sym))!= SCM_BOOL_F) { - yylval.pitch = new Musical_pitch (pitch); - yylval.pitch->set_spot (Input (source_file_l (), - here_ch_C ())); + yylval.scm = ly_cdr (pitch); return CHORDMODIFIER_PITCH; } } - yylval.scm = ly_str02scm (str.ch_C()); + yylval.scm = ly_str02scm (str.ch_C ()); return STRING; } @@ -559,8 +597,14 @@ My_lily_lexer::lyric_state_b () const return YY_START == lyrics; } +bool +My_lily_lexer::figure_state_b () const +{ + return YY_START == figures; +} + /* - urg, belong to String(_convert) + urg, belong to String (_convert) and should be generalised */ void @@ -587,18 +631,68 @@ strip_trailing_white (String&s) +Lilypond_version oldest_version ("1.3.59"); + +void +print_lilypond_versions (ostream &os) +{ + os << _f ("Oldest supported input version: %s", oldest_version.str ()) + << endl; +} + bool valid_version_b (String s) { - Mudela_version current ( MAJOR_VERSION "." MINOR_VERSION "." PATCH_LEVEL ); - Mudela_version ver (s); - if (!((ver >= oldest_version) && (ver <= current))) + Lilypond_version current ( MAJOR_VERSION "." MINOR_VERSION "." PATCH_LEVEL ); + Lilypond_version ver (s); + if (! ((ver >= oldest_version) && (ver <= current))) { - non_fatal_error (_f ("incorrect mudela version: %s (%s, %s)", ver.str (), oldest_version.str (), current.str ())); - non_fatal_error (_("Consider converting the input with the convert-mudela script")); + non_fatal_error (_f ("incorrect lilypond version: %s (%s, %s)", ver.str (), oldest_version.str (), current.str ())); + non_fatal_error (_ ("Consider converting the input with the convert-ly script")); return false; } return true; } + +String +lyric_fudge (String s) +{ + char * chars =s.copy_ch_p (); + + for (char * p = chars; *p ; p++) + { + if (*p == '_' && (p == chars || *(p-1) != '\\')) + *p = ' '; + } + + s = String (chars); + delete[] chars; + + int i =0; + if ((i=s.index_i ("\\,")) != -1) // change "\," to TeX's "\c " + { + * (s.ch_l () + i + 1) = 'c'; + s = s.left_str (i+2) + " " + s.right_str (s.length_i ()-i-2); + } + + return s; +} + +/* +Convert "NUM/DEN" into a '(NUM . DEN) cons. +*/ +SCM +scan_fraction (String frac) +{ + int i = frac.index_i ('/'); + int l = frac.length_i (); + String left = frac.left_str (i); + String right = frac.right_str (l - i - 1); + + int n = String_convert::dec2_i (left); + int d = String_convert::dec2_i (right); + return gh_cons (gh_int2scm (n), gh_int2scm (d)); +} +