X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flexer.ll;h=7fc5828206eef619feb4a24bec0ceeda232ee15c;hb=de19d3787ab5ba1d4bd951176eaa03b2b4ceee95;hp=c90632a355e28a8844590da513e9ae3e6b98cf40;hpb=91ad96d55a9848ab482d0946987aaa68af76d357;p=lilypond.git diff --git a/lily/lexer.ll b/lily/lexer.ll index c90632a355..7fc5828206 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,24 +26,28 @@ #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 "score.hh" +#include "parse-scm.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 "version.hh" #include "lilypond-input-version.hh" #include "translator-def.hh" -#include "music-output-def.hh" +#include "identifier-smob.hh" /* RH 7 fix (?) @@ -54,6 +58,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); @@ -65,7 +71,7 @@ valid_version_b (String s); yylval.string = new String #define yylval \ - (*(YYSTYPE*)lexval_l) + (*(YYSTYPE*)lexval) #define YY_USER_ACTION add_lexed_char (YYLeng ()); /* @@ -76,6 +82,9 @@ LYRICS ({AA}|{TEX})[^0-9 \t\n\f]* SCM scan_fraction (String); +SCM (* scm_parse_error_handler) (void *); + + %} @@ -96,7 +105,7 @@ SCM scan_fraction (String); %x figures %x quote %x longcomment - +%x markup A [a-zA-Z] AA {A}|_ @@ -110,6 +119,7 @@ WORD {A}{AN}* ALPHAWORD {A}+ DIGIT {N} UNSIGNED {N}+ +E_UNSIGNED \\{N}+ FRACTION {N}+\/{N}+ INT -?{UNSIGNED} REAL ({INT}\.{N}*)|(-?\.{N}+) @@ -119,6 +129,7 @@ HORIZONTALWHITE [ \t] BLACK [^ \n\t\f\r] RESTNAME [rs] NOTECOMMAND \\{A}+ +MARKUPCOMMAND \\({A}|[-_])+ LYRICS ({AA}|{TEX})[^0-9 \t\n\f]* ESCAPED [nt\\'"] EXTENDER __ @@ -130,7 +141,7 @@ HYPHEN -- // windows-suck-suck-suck } -{ +{ "%{" { yy_push_state (longcomment); } @@ -152,7 +163,7 @@ HYPHEN -- } \"[^"]*\" { /* got the version number */ String s (YYText ()+1); - s = s.left_str (s.index_last_i ('"')); + s = s.left_string (s.index_last ('\"')); yy_pop_state (); if (!valid_version_b (s)) @@ -172,7 +183,7 @@ 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 } @@ -194,25 +205,25 @@ HYPHEN -- } \"[^"]*\";? { /* got the include file name */ String s (YYText ()+1); - s = s.left_str (s.index_last_i ('"')); + s = s.left_string (s.index_last ('"')); - new_input (s,source_global_l); + 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); + 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 ()); + LexerError (msg.to_str0 ()); SCM err = scm_current_error_port (); scm_puts ("This value was found in the table: ", err); scm_display (sid, err); @@ -224,7 +235,7 @@ HYPHEN -- } {RESTNAME} { const char *s = YYText (); - yylval.scm = ly_str02scm (s); + yylval.scm = scm_makfrom0str (s); return RESTNAME; } R { @@ -232,12 +243,12 @@ HYPHEN -- } \\\${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} { 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 @@ -249,25 +260,45 @@ HYPHEN -- 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); - + 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 CHORD_OPEN; + } + \>\> { + return CHORD_CLOSE; + } +} { _ { return FIGURE_SPACE; @@ -279,6 +310,7 @@ HYPHEN -- return FIGURE_OPEN; } } + { {ALPHAWORD} { return scan_bare_word (YYText ()); @@ -293,13 +325,17 @@ HYPHEN -- } {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 (); @@ -311,7 +347,7 @@ HYPHEN -- } { \\{ESCAPED} { - *yylval.string += to_str (escaped_char (YYText ()[1])); + *yylval.string += to_string (escaped_char (YYText ()[1])); } [^\\"]+ { *yylval.string += YYText (); @@ -322,7 +358,7 @@ HYPHEN -- /* 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; } @@ -340,7 +376,7 @@ HYPHEN -- return FRACTION; } {UNSIGNED} { - yylval.i = String_convert::dec2_i (String (YYText ())); + yylval.i = String_convert::dec2int (String (YYText ())); return UNSIGNED; } {NOTECOMMAND} { @@ -355,11 +391,11 @@ HYPHEN -- return yylval.i = HYPHEN; s = lyric_fudge (s); - char c = s[s.length_i () - 1]; + 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 ()); return STRING; @@ -380,7 +416,7 @@ HYPHEN -- return FRACTION; } {UNSIGNED} { - yylval.i = String_convert::dec2_i (String (YYText ())); + yylval.i = String_convert::dec2int (String (YYText ())); return UNSIGNED; } \" { @@ -395,6 +431,9 @@ HYPHEN -- \/\+ { return CHORD_BASS; } + \/ { + return CHORD_SLASH; + } \^ { return CHORD_CARET; } @@ -403,6 +442,62 @@ HYPHEN -- } } + +{ + \" { + start_quote (); + } + {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); + } + {LYRICS} { + 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 lyric. Did you forget a space?")); + yylval.scm = scm_makfrom0str (s.to_str0 ()); + + + return STRING; + } + {WHITE} { + + } + . { + return YYText ()[0]; + } +} + <> { @@ -428,10 +523,11 @@ HYPHEN -- } {UNSIGNED} { - yylval.i = String_convert::dec2_i (String (YYText ())); + yylval.i = String_convert::dec2int (String (YYText ())); return UNSIGNED; } + [{}] { return YYText ()[0]; @@ -468,6 +564,7 @@ HYPHEN -- return E_TILDE; case '\\': return E_BACKSLASH; + default: return E_CHAR; } @@ -475,7 +572,7 @@ HYPHEN -- <*>. { String msg = _f ("invalid character: `%c'", YYText ()[0]); - LexerError (msg.ch_C ()); + LexerError (msg.to_str0 ()); return YYText ()[0]; } @@ -504,51 +601,42 @@ 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) { // 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) { 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)) { @@ -561,9 +649,9 @@ My_lily_lexer::scan_escaped_word (String str) } } 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; } @@ -571,7 +659,7 @@ 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_get_handle (pitchname_tab_, sym); if (gh_pair_p (pitch)) { @@ -580,11 +668,11 @@ 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; } } - yylval.scm = ly_str02scm (str.ch_C ()); + yylval.scm = scm_makfrom0str (str.to_str0 ()); return STRING; } @@ -620,22 +708,22 @@ 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); } @@ -651,18 +739,21 @@ 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.str (), oldest_version.str (), current.str ())); - non_fatal_error (_ ("Consider converting the input with the convert-ly script")); + 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; } return true; } +/* + substittute _ adn \, +*/ String lyric_fudge (String s) { - char * chars =s.copy_ch_p (); + char * chars =s.get_copy_str0 (); for (char * p = chars; *p ; p++) { @@ -674,10 +765,10 @@ lyric_fudge (String s) delete[] chars; int i =0; - if ((i=s.index_i ("\\,")) != -1) // change "\," to TeX's "\c " + if ((i=s.index ("\\,")) != -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.get_str0 () + i + 1) = 'c'; + s = s.left_string (i+2) + " " + s.right_string (s.length ()-i-2); } return s; @@ -689,13 +780,42 @@ 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 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::dec2_i (left); - int d = String_convert::dec2_i (right); + int n = String_convert::dec2int (left); + 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 ())); +}