X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flexer.ll;h=48d8c3564048cdac9e594947b7161ebfac8c5bd8;hb=d765f3af45be51f15da55cf570a4b172200e1035;hp=dfbdfd9a3629f79b452a19c79a9acd0a28b80bf3;hpb=03311c038c913d96eb7ed0a896e2c7d8f4815e17;p=lilypond.git diff --git a/lily/lexer.ll b/lily/lexer.ll index dfbdfd9a36..48d8c35640 100644 --- a/lily/lexer.ll +++ b/lily/lexer.ll @@ -18,31 +18,42 @@ 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 +#include + +#include "parse-scm.hh" +#include "score.hh" #include "lily-guile.hh" #include "string.hh" #include "string-convert.hh" #include "my-lily-lexer.hh" -#include "array.hh" +#include "input-file-results.hh" #include "interval.hh" #include "lily-guile.hh" #include "parser.hh" -#include "debug.hh" +#include "warn.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 +65,8 @@ valid_version_b (String s); yy_push_state (quote);\ yylval.string = new String -#define yylval (*(YYSTYPE*)lexval_l) +#define yylval \ + (*(YYSTYPE*)lexval) #define YY_USER_ACTION add_lexed_char (YYLeng ()); /* @@ -63,6 +75,11 @@ LYRICS ({AA}|{TEX})[^0-9 \t\n\f]* */ + +SCM scan_fraction (String); +SCM (* scm_parse_error_handler) (void *); + + %} %option c++ @@ -79,6 +96,7 @@ LYRICS ({AA}|{TEX})[^0-9 \t\n\f]* %x incl %x lyrics %x notes +%x figures %x quote %x longcomment @@ -87,14 +105,16 @@ 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}+ +E_UNSIGNED \\{N}+ +FRACTION {N}+\/{N}+ INT -?{UNSIGNED} REAL ({INT}\.{N}*)|(-?\.{N}+) KEYWORD \\{WORD} @@ -114,7 +134,7 @@ HYPHEN -- // windows-suck-suck-suck } -{ +{ "%{" { yy_push_state (longcomment); } @@ -131,13 +151,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"; + s = s.left_string (s.index_last ('"')); + yy_pop_state (); if (!valid_version_b (s)) return INVALID; @@ -156,14 +176,14 @@ HYPHEN -- yy_pop_state (); } <> { - LexerError (_ ("EOF found inside a comment").ch_C ()); + LexerError (_ ("EOF found inside a comment").to_str0 ()); if (! close_input ()) yyterminate (); // can't move this, since it actually rets a YY_NULL } } -\\maininput { +\\maininput { if (!main_input_b_) { start_main_input (); @@ -173,74 +193,76 @@ 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); + s = s.left_string (s.index_last ('"')); + + new_input (s, &global_input_file->sources_ ); yy_pop_state (); } \\{BLACK}*;?{WHITE} { /* got the include identifier */ String s = YYText () + 1; 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"; + 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), source_global_l); + new_input (ly_scm2string (sid), &global_input_file->sources_); yy_pop_state (); } else { - String msg (_f ("wrong or undefined identifier: `%s'", s )); - LexerError (msg.ch_C ()); + String msg (_f ("wrong or undefined identifier: `%s'", s )); + + LexerError (msg.to_str0 ()); + 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; + error (_ ("Missing end quote")); exit (1); } -{RESTNAME} { +{RESTNAME} { const char *s = YYText (); - yylval.scm = ly_str02scm (s); + yylval.scm = scm_makfrom0str (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); + s=s.left_string (s.length () - 1); return scan_escaped_word (s); } -\${BLACK}*{WHITE} { +\${BLACK}*{WHITE} { String s=YYText () + 1; - s=s.left_str (s.length_i () - 1); + s=s.left_string (s.length () - 1); return scan_bare_word (s); } -\\\${BLACK}* { // backup rule - cerr << _ ("white expected") << endl; +\\\${BLACK}* { // backup rule + error (_("white expected")); exit (1); } -\${BLACK}* { // backup rule - cerr << _ ("white expected") << endl; +\${BLACK}* { // backup rule + error (_("white expected")); exit (1); } -# { //embedded scm + +# { //embedded scm //char const* s = YYText () + 1; - char const* s = here_ch_C (); + 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); - DEBUG_OUT << "Scheme: "; - if (flower_dstream) - ly_display_scm (yylval.scm); + yylval.scm = ly_parse_scm (s, &n, here_input()); for (int i=0; i < n; i++) { @@ -250,7 +272,18 @@ HYPHEN -- return SCM_T; } -{ +{ + _ { + return FIGURE_SPACE; + } + \> { + return FIGURE_CLOSE; + } + \< { + return FIGURE_OPEN; + } +} +{ {ALPHAWORD} { return scan_bare_word (YYText ()); } @@ -258,15 +291,23 @@ 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 ())); + yylval.i = String_convert::dec2int (String (YYText ())); return DIGIT; } {UNSIGNED} { - yylval.i = String_convert::dec2_i (String (YYText ())); + yylval.i = String_convert::dec2int (String (YYText ())); return UNSIGNED; } + {E_UNSIGNED} { + yylval.i = String_convert::dec2int (String (YYText () +1)); + return E_UNSIGNED; + } \" { start_quote (); @@ -278,18 +319,18 @@ HYPHEN -- } { \\{ESCAPED} { - *yylval.string += to_str (escaped_char(YYText()[1])); + *yylval.string += to_string (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 = scm_makfrom0str (sp->to_str0 ()); delete sp; return STRING; } @@ -302,8 +343,12 @@ HYPHEN -- \" { start_quote (); } + {FRACTION} { + yylval.scm = scan_fraction (YYText ()); + return FRACTION; + } {UNSIGNED} { - yylval.i = String_convert::dec2_i (String (YYText ())); + yylval.i = String_convert::dec2int (String (YYText ())); return UNSIGNED; } {NOTECOMMAND} { @@ -316,22 +361,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); - } - - char c = s[s.length_i () - 1]; + s = lyric_fudge (s); + + 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?"); - yylval.scm = ly_str02scm (s.ch_C ()); + _ ("Brace found at end of lyric. Did you forget a space?")); + yylval.scm = scm_makfrom0str (s.to_str0 ()); + - DEBUG_OUT << "lyric : `" << s << "'\n"; return STRING; } . { @@ -345,8 +383,12 @@ 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 ())); + yylval.i = String_convert::dec2int (String (YYText ())); return UNSIGNED; } \" { @@ -361,6 +403,9 @@ HYPHEN -- \/\+ { return CHORD_BASS; } + \/ { + return CHORD_SLASH; + } \^ { return CHORD_CARET; } @@ -370,7 +415,7 @@ HYPHEN -- } <> { - DEBUG_OUT << "<>"; + if (! close_input ()) { yyterminate (); // can't move this, since it actually rets a YY_NULL @@ -388,32 +433,32 @@ 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; } {UNSIGNED} { - yylval.i = String_convert::dec2_i (String (YYText ())); + yylval.i = String_convert::dec2int (String (YYText ())); return UNSIGNED; } + [{}] { - 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 +468,19 @@ HYPHEN -- return E_SMALLER; case '!': return E_EXCLAMATION; + case '(': + return E_OPEN; + case ')': + return E_CLOSE; + case '[': + return E_LEFTSQUARE; + case ']': + return E_RIGHTSQUARE; + case '~': + return E_TILDE; + case '\\': + return E_BACKSLASH; + default: return E_CHAR; } @@ -430,7 +488,7 @@ HYPHEN -- <*>. { String msg = _f ("invalid character: `%c'", YYText ()[0]); - LexerError (msg.ch_C ()); + LexerError (msg.to_str0 ()); return YYText ()[0]; } @@ -442,6 +500,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 +528,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.to_str0 ()); int l = lookup_keyword (str); if (l != -1) { @@ -478,41 +541,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 ()); + LexerError (msg.to_str0 ()); - yylval.scm = ly_str02scm(str.ch_C()); + yylval.scm = scm_makfrom0str (str.to_str0 ()); return STRING; } @@ -520,24 +584,20 @@ My_lily_lexer::scan_escaped_word (String str) int My_lily_lexer::scan_bare_word (String str) { - SCM sym = ly_symbol2scm (str.ch_C ()); + SCM sym = ly_symbol2scm (str.to_str0 ()); 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 = scm_makfrom0str (str.to_str0 ()); return STRING; } @@ -559,46 +619,96 @@ 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 strip_leading_white (String&s) { int i=0; - for (; i < s.length_i (); i++) + for (; i < s.length (); i++) if (!isspace (s[i])) break; - s = s.nomid_str (0, i); + s = s.nomid_string (0, i); } void strip_trailing_white (String&s) { - int i=s.length_i (); + int i=s.length (); while (i--) if (!isspace (s[i])) break; - s = s.left_str (i+1); + s = s.left_string (i+1); } +/* 1.3.146 == removal of ; */ +Lilypond_version oldest_version ("1.3.146"); + 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.string (), oldest_version.string (), current.string ())); + non_fatal_error (_ ("Consider updating the input with the convert-ly script")); return false; } return true; } + +String +lyric_fudge (String s) +{ + char * chars =s.get_copy_str0 (); + + 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 ("\\,")) != -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); + } + + return s; +} + +/* +Convert "NUM/DEN" into a '(NUM . DEN) cons. +*/ +SCM +scan_fraction (String frac) +{ + int i = frac.index ('/'); + int l = frac.length (); + String left = frac.left_string (i); + String right = frac.right_string (l - i - 1); + + int n = String_convert::dec2int (left); + int d = String_convert::dec2int (right); + return gh_cons (gh_int2scm (n), gh_int2scm (d)); +} +