X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flexer.ll;h=fe8dacfb7816863c83757962f184425828b196c8;hb=078703a6ab29f75983a55ac2cc35fe5f315da574;hp=c2cb3077ca71401c2a27c611c065f2c858712c7f;hpb=2beb46604db29ec535c8bf512945cfc754aca33c;p=lilypond.git diff --git a/lily/lexer.ll b/lily/lexer.ll index c2cb3077ca..fe8dacfb78 100644 --- a/lily/lexer.ll +++ b/lily/lexer.ll @@ -4,7 +4,7 @@ source file of the LilyPond music typesetter - (c) 1996--2003 Han-Wen Nienhuys + (c) 1996--2005 Han-Wen Nienhuys Jan Nieuwenhuizen */ @@ -22,24 +22,26 @@ */ -#include -#include -#include + +#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 "lily-lexer.hh" #include "interval.hh" #include "lily-guile.hh" #include "parser.hh" @@ -58,22 +60,25 @@ RH 7 fix (?) 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); - +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) +#define yylloc \ + (*(YYLTYPE*)lexloc) + #define YY_USER_ACTION add_lexed_char (YYLeng ()); /* @@ -93,21 +98,22 @@ SCM (* scm_parse_error_handler) (void *); %option noyywrap %option nodefault %option debug -%option yyclass="My_lily_lexer" +%option yyclass="Lily_lexer" %option stack %option never-interactive %option warn -%x renameinput -%x version %x chords +%x figures %x incl %x lyrics +%x lyric_quote +%x longcomment +%x markup %x notes -%x figures %x quote -%x longcomment -%x markup +%x renameinput +%x version A [a-zA-Z] AA {A}|_ @@ -136,6 +142,7 @@ LYRICS ({AA}|{TEX})[^0-9 \t\n\r\f]* ESCAPED [nt\\'"] EXTENDER __ HYPHEN -- +BOM_UTF8 \357\273\277 %% @@ -143,7 +150,17 @@ HYPHEN -- // windows-suck-suck-suck } -{ +{BOM_UTF8} { + if (this->lexloc->line_number () != 1 || this->lexloc->column_number () != 0) + { + LexerError (_ ("stray UTF-8 BOM encountered").to_str0 ()); + exit (1); + } + if (be_verbose_global) + message (_ ("Skipping UTF-8 BOM")); +} + +{ "%{" { yy_push_state (longcomment); } @@ -167,32 +184,36 @@ HYPHEN -- yy_push_state (renameinput); } \"[^"]*\" { /* 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)) + yy_pop_state (); + if (!is_valid_version (s)) return INVALID; + + SCM top_scope = scm_car (scm_last_pair (scopes_)); + scm_module_define (top_scope, ly_symbol2scm ("version-seen?"), SCM_BOOL_T); + } -\"[^"]*\" { /* got the version number */ - String s (YYText ()+1); +\"[^"]*\" { + String s (YYText () + 1); s = s.left_string (s.index_last ('\"')); - yy_pop_state(); - this->here_input().source_file_->name_ = s; - progress_indication (_f("\nRenamed input to `%s'", s.to_str0())); - scm_module_define (gh_car (scopes_), + yy_pop_state (); + this->here_input().get_source_file ()->name_ = s; + message (_f ("Renaming input to: `%s'", s.to_str0 ())); + progress_indication ("\n"); + scm_module_define (scm_car (scopes_), ly_symbol2scm ("input-file-name"), - scm_makfrom0str (s.to_str0())); + scm_makfrom0str (s.to_str0 ())); } - . { - LexerError ("No quoted string found after \\version"); + LexerError (_ ("quoted string expected after \\version").to_str0 ()); yy_pop_state (); } . { - LexerError ("No quoted string found after \\renameinput"); + LexerError (_ ("quoted string expected after \\renameinput").to_str0 ()); yy_pop_state (); } { @@ -206,6 +227,7 @@ HYPHEN -- } <> { LexerError (_ ("EOF found inside a comment").to_str0 ()); + is_main_input_ = false; if (! close_input ()) yyterminate (); // can't move this, since it actually rets a YY_NULL } @@ -213,34 +235,34 @@ HYPHEN -- \\maininput { - if (!main_input_b_) + if (!is_main_input_) { start_main_input (); - main_input_b_ = true; + is_main_input_ = true; } else - error (_ ("\\maininput disallowed outside init files")); + error (_ ("\\maininput not allowed outside init files")); } \\include { yy_push_state (incl); } -\"[^"]*\";? { /* got the include file name */ +\"[^"]*\" { /* got the include file name */ 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 */ +\\{BLACK}*{WHITE} { /* got the include identifier */ 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 (scm_is_string (sid)) { + new_input (ly_scm2string (sid), sources_); yy_pop_state (); } else { String msg (_f ("wrong or undefined identifier: `%s'", s )); @@ -252,53 +274,31 @@ HYPHEN -- } } \"[^"]* { // backup rule - error (_ ("Missing end quote")); + error (_ ("end quote missing")); exit (1); } {RESTNAME} { - const char *s = YYText (); + char const *s = YYText (); yylval.scm = scm_makfrom0str (s); return RESTNAME; } 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 - //char const* s = YYText () + 1; - char const* s = here_str0 (); +# { //embedded scm 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()); + Input hi = here_input(); + hi.step_forward (); + SCM sval = ly_parse_scm (hi.start (), &n, hi, + be_safe_global && is_main_input_); + if (sval == SCM_UNDEFINED) - { + { sval = SCM_UNSPECIFIED; - errorlevel_ = 1; - } + error_level_ = 1; + } - for (int i=0; i < n; i++) + for (int i = 0; i < n; i++) { yyinput (); } @@ -315,10 +315,10 @@ HYPHEN -- } { \<\< { - return LESSLESS; + return DOUBLE_ANGLE_OPEN; } \>\> { - return MOREMORE; + return DOUBLE_ANGLE_CLOSE; } } { @@ -358,7 +358,6 @@ HYPHEN -- yylval.i = String_convert::dec2int (String (YYText () +1)); return E_UNSIGNED; } - \" { start_quote (); } @@ -388,10 +387,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 ()); @@ -420,7 +440,7 @@ HYPHEN -- yylval.scm = scm_makfrom0str (s.to_str0 ()); - return STRING; + return LYRICS_STRING; } . { return YYText ()[0]; @@ -469,19 +489,16 @@ HYPHEN -- \" { start_quote (); } - \< { - return '<'; - } - \> { - return '>'; + \\score { + return SCORE; } {MARKUPCOMMAND} { - String str (YYText() + 1); + 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 (scm_is_pair (s) && scm_is_symbol (scm_cdr (s)) ) { + yylval.scm = scm_car(s); + SCM tag = scm_cdr(s); if (tag == ly_symbol2scm("markup0")) return MARKUP_HEAD_MARKUP0; if (tag == ly_symbol2scm("empty")) @@ -501,7 +518,7 @@ HYPHEN -- 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"); + programming_error ("no parser tag defined for this markup signature"); ly_display_scm (s); assert(false); } @@ -509,13 +526,14 @@ HYPHEN -- return scan_escaped_word (str); } [{}] { - return YYText()[0]; + 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. + /* 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 ()); @@ -529,11 +547,16 @@ HYPHEN -- } <> { - - - if (! close_input ()) { - yyterminate (); // can't move this, since it actually rets a YY_NULL + if (is_main_input_) + { + is_main_input_ = false; + if (!close_input ()) + /* Returns YY_NULL */ + yyterminate (); } + else if (!close_input ()) + /* Returns YY_NULL */ + yyterminate (); } @@ -545,10 +568,10 @@ HYPHEN -- } {REAL} { Real r; - int cnv=sscanf (YYText (), "%lf", &r); + int cnv = sscanf (YYText (), "%lf", &r); assert (cnv == 1); - yylval.scm = gh_double2scm (r); + yylval.scm = scm_from_double (r); return REAL; } @@ -573,13 +596,13 @@ HYPHEN -- } \\. { - char c= YYText ()[1]; + char c = YYText ()[1]; switch (c) { case '>': - return E_BIGGER; + return E_ANGLE_CLOSE; case '<': - return E_SMALLER; + return E_ANGLE_OPEN; case '!': return E_EXCLAMATION; case '(': @@ -587,9 +610,11 @@ HYPHEN -- case ')': return E_CLOSE; case '[': - return E_LEFTSQUARE; + return E_BRACKET_OPEN; + case '+': + return E_PLUS; case ']': - return E_RIGHTSQUARE; + return E_BRACKET_CLOSE; case '~': return E_TILDE; case '\\': @@ -609,75 +634,85 @@ HYPHEN -- %% void -My_lily_lexer::push_note_state () +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() +Lily_lexer::push_figuredbass_state () { yy_push_state (figures); } + void -My_lily_lexer::push_chord_state () +Lily_lexer::push_initial_state () { - yy_push_state (chords); + yy_push_state (INITIAL); } void -My_lily_lexer::push_lyric_state () +Lily_lexer::push_lyric_state () { yy_push_state (lyrics); } void -My_lily_lexer::push_markup_state () +Lily_lexer::push_markup_state () { yy_push_state (markup); } void -My_lily_lexer::pop_state () +Lily_lexer::push_note_state (SCM tab) { + pitchname_tab_stack_ = scm_cons (tab, pitchname_tab_stack_); + yy_push_state (notes); +} + +void +Lily_lexer::pop_state () +{ + if (YYSTATE == notes || YYSTATE == chords) + pitchname_tab_stack_ = scm_cdr (pitchname_tab_stack_); yy_pop_state (); } int -My_lily_lexer::identifier_type(SCM sid) +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; } int -My_lily_lexer::scan_escaped_word (String str) +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 i = lookup_keyword (str); + if (i == MARKUP && is_lyric_state ()) + return LYRIC_MARKUP; + if (i != -1) + return i; - 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 ()); @@ -687,17 +722,24 @@ My_lily_lexer::scan_escaped_word (String str) } int -My_lily_lexer::scan_bare_word (String str) +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 (scm_is_pair (pitchname_tab_stack_)) + handle = scm_hashq_get_handle (scm_car (pitchname_tab_stack_), sym); + + if (scm_is_pair (handle)) { + yylval.scm = scm_cdr (handle); + if (unsmob_pitch (yylval.scm)) + return (YYSTATE == notes) ? NOTENAME_PITCH : TONICNAME_PITCH; + else if (scm_is_symbol (yylval.scm)) + return DRUM_PITCH; + } + else if ((handle = scm_hashq_get_handle (chordmodifier_tab_, sym))!= SCM_BOOL_F) { - yylval.scm = ly_cdr (pitch); + yylval.scm = scm_cdr (handle); return CHORD_MODIFIER; } } @@ -707,25 +749,25 @@ My_lily_lexer::scan_bare_word (String str) } bool -My_lily_lexer::note_state_b () const +Lily_lexer::is_note_state () const { return YY_START == notes; } bool -My_lily_lexer::chord_state_b () const +Lily_lexer::is_chord_state () const { return YY_START == chords; } bool -My_lily_lexer::lyric_state_b () const +Lily_lexer::is_lyric_state () const { return YY_START == lyrics; } bool -My_lily_lexer::figure_state_b () const +Lily_lexer::is_figure_state () const { return YY_START == figures; } @@ -737,7 +779,7 @@ My_lily_lexer::figure_state_b () const void strip_leading_white (String&s) { - int i=0; + int i = 0; for (; i < s.length (); i++) if (!isspace (s[i])) break; @@ -748,7 +790,7 @@ strip_leading_white (String&s) void strip_trailing_white (String&s) { - int i=s.length (); + int i = s.length (); while (i--) if (!isspace (s[i])) break; @@ -758,12 +800,12 @@ strip_trailing_white (String&s) -/* 1.9.0 == postfix articulations */ -Lilypond_version oldest_version ("1.9.0"); +/* 2.1.2x something -> \property -> \set. */ +Lilypond_version oldest_version ("2.3.22"); bool -valid_version_b (String s) +is_valid_version (String s) { Lilypond_version current ( MAJOR_VERSION "." MINOR_VERSION "." PATCH_LEVEL ); Lilypond_version ver (s); @@ -778,12 +820,12 @@ valid_version_b (String s) /* - substittute _ adn \, + substitute _ and \, */ String lyric_fudge (String s) { - char * chars =s.get_copy_str0 (); + char * chars = s.get_copy_str0 (); for (char * p = chars; *p ; p++) { @@ -794,8 +836,8 @@ lyric_fudge (String s) s = String (chars); delete[] chars; - int i =0; - if ((i=s.index ("\\,")) != -1) // change "\," to TeX's "\c " + 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); @@ -817,35 +859,114 @@ 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_from_int (n), scm_from_int (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; } +SCM +lookup_markup_command (String s) +{ + SCM proc = ly_lily_module_constant ("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 ("scm-scm")) + { + return MUSIC_FUNCTION_SCM_SCM; + } + 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 ("scm-scm-scm")) + { + return MUSIC_FUNCTION_SCM_SCM_SCM; + } + else if (type == ly_symbol2scm ("markup")) + { + return MUSIC_FUNCTION_MARKUP; + } + else if (type == ly_symbol2scm ("markup-music")) + { + return MUSIC_FUNCTION_MARKUP_MUSIC; + } + else if (type == ly_symbol2scm ("markup-markup")) + { + return MUSIC_FUNCTION_MARKUP_MARKUP; + } + else if (type == ly_symbol2scm ("markup-music-music")) + { + return MUSIC_FUNCTION_MARKUP_MUSIC_MUSIC; + } + else if (type == ly_symbol2scm ("markup-markup-music")) + { + return MUSIC_FUNCTION_MARKUP_MARKUP_MUSIC; + } + else if (type == ly_symbol2scm ("noarg")) + { + return MUSIC_FUNCTION; + } + else + { + /* TODO: print location */ + error (_ ("can't find signature for music function")); + } + + return MUSIC_FUNCTION_SCM; +} + +/* Shut up lexer warnings. */ +#if YY_STACK_USED static void -avoid_silly_flex_induced_gcc_warnings () +yy_push_state (int) { - (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 void +yy_pop_state () { - static SCM proc ; - if (!proc) - proc = scm_c_eval_string ("lookup-markup-command"); +} - return scm_call_1 (proc, scm_makfrom0str (s.to_str0 ())); +static int +yy_top_state () +{ + return 0; } + +static void +silence_lexer_warnings () +{ + (void) yy_start_stack_ptr; + (void) yy_start_stack_depth; + (void) yy_start_stack; + (void) yy_push_state; + (void) yy_pop_state; + (void) yy_top_state; + (void) silence_lexer_warnings; +} +#endif