X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flexer.ll;h=882418242d9d4ce8577ee81069a22d8ef75f5675;hb=0052082fd05c21b95cdd5f20c2a11d14e3ce2d1f;hp=8bf851eea4b5e3a63cb2b240bfb9682674ff9ccf;hpb=1aa6d40d595d25202bd7b5ce82edf320845dc7a4;p=lilypond.git diff --git a/lily/lexer.ll b/lily/lexer.ll index 8bf851eea4..882418242d 100644 --- a/lily/lexer.ll +++ b/lily/lexer.ll @@ -1,13 +1,23 @@ %{ // -*-Fundamental-*- /* - lexer.ll -- implement the Flex lexer + This file is part of LilyPond, the GNU music typesetter. - source file of the LilyPond music typesetter + Copyright (C) 1996--2011 Han-Wen Nienhuys + Jan Nieuwenhuizen - (c) 1996--2006 Han-Wen Nienhuys - Jan Nieuwenhuizen -*/ + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . +*/ /* backup rules @@ -41,7 +51,8 @@ using namespace std; #include "interval.hh" #include "lily-guile.hh" #include "lily-lexer.hh" -#include "lilypond-input-version.hh" +#include "lily-parser.hh" +#include "lilypond-version.hh" #include "main.hh" #include "music.hh" #include "music-function.hh" @@ -62,6 +73,7 @@ void strip_trailing_white (string&); void strip_leading_white (string&); string lyric_fudge (string s); SCM lookup_markup_command (string s); +SCM lookup_markup_list_command (string s); bool is_valid_version (string s); @@ -74,10 +86,10 @@ bool is_valid_version (string s); yylval.string = new string #define yylval \ - (*(YYSTYPE*)lexval) + (*(YYSTYPE*)lexval_) #define yylloc \ - (*(YYLTYPE*)lexloc) + (*(YYLTYPE*)lexloc_) #define YY_USER_ACTION add_lexed_char (YYLeng ()); @@ -170,8 +182,10 @@ BOM_UTF8 \357\273\277 return type; } -{BOM_UTF8} { - if (this->lexloc->line_number () != 1 || this->lexloc->column_number () != 0) + /* Use the trailing context feature. Otherwise, the BOM will not be + found if the file starts with an identifier definition. */ +{BOM_UTF8}/.* { + if (this->lexloc_->line_number () != 1 || this->lexloc_->column_number () != 0) { LexerError (_ ("stray UTF-8 BOM encountered").c_str ()); exit (1); @@ -184,13 +198,13 @@ BOM_UTF8 \357\273\277 "%{" { yy_push_state (longcomment); } - %[^{\n\r].*[\n\r] { + %[^{\n\r][^\n\r]*[\n\r] { } %[^{\n\r] { // backup rule } %[\n\r] { } - %[^{\n\r].* { + %[^{\n\r][^\n\r]* { } {WHITE}+ { @@ -236,7 +250,7 @@ BOM_UTF8 \357\273\277 progress_indication ("\n"); scm_module_define (scm_car (scopes_), ly_symbol2scm ("input-file-name"), - scm_makfrom0str (s.c_str ())); + ly_string2scm (s)); } @@ -271,7 +285,7 @@ BOM_UTF8 \357\273\277 } <> { LexerError (_ ("EOF found inside a comment").c_str ()); - is_main_input_ = false; + is_main_input_ = false; // should be safe , can't have \include in --safe. if (! close_input ()) yyterminate (); // can't move this, since it actually rets a YY_NULL } @@ -323,7 +337,7 @@ BOM_UTF8 \357\273\277 } {RESTNAME} { char const *s = YYText (); - yylval.scm = scm_makfrom0str (s); + yylval.scm = scm_from_locale_string (s); return RESTNAME; } R { @@ -334,7 +348,7 @@ BOM_UTF8 \357\273\277 Input hi = here_input(); hi.step_forward (); SCM sval = ly_parse_scm (hi.start (), &n, hi, - be_safe_global && is_main_input_); + be_safe_global && is_main_input_, parser_); if (sval == SCM_UNDEFINED) { @@ -353,6 +367,11 @@ BOM_UTF8 \357\273\277 yylval.scm = unpack_identifier(sval); return identifier_type (yylval.scm); } + + for (size_t i = 0; i < pending_string_includes_.size (); i++) + new_input ("", pending_string_includes_[i], + parser_->sources_); + pending_string_includes_.clear (); yylval.scm = sval; return SCM_TOKEN; @@ -418,7 +437,7 @@ BOM_UTF8 \357\273\277 \\{ESCAPED} { *yylval.string += to_string (escaped_char (YYText ()[1])); } - [^\\"]+ { + [^\\""]+ { *yylval.string += YYText (); } \" { @@ -427,7 +446,7 @@ BOM_UTF8 \357\273\277 /* yylval is union. Must remember STRING before setting SCM*/ string *sp = yylval.string; - yylval.scm = scm_makfrom0str (sp->c_str ()); + yylval.scm = ly_string2scm (*sp); delete sp; return is_lyric_state () ? LYRICS_STRING : STRING; } @@ -464,7 +483,7 @@ BOM_UTF8 \357\273\277 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.c_str ()); + yylval.scm = ly_string2scm (s); return LYRICS_STRING; @@ -515,36 +534,53 @@ BOM_UTF8 \357\273\277 } {MARKUPCOMMAND} { string str (YYText () + 1); + + int token_type = MARKUP_FUNCTION; SCM s = lookup_markup_command (str); - 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")) - 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 markup signature"); - ly_display_scm (s); - assert(false); - } - } else - return scan_escaped_word (str); + // lookup-markup-command returns a pair with the car + // being the function to call, and the cdr being the + // call signature specified to define-markup-command, + // a list of predicates. + + if (!scm_is_pair (s)) { + // If lookup-markup-command was not successful, we + // try lookup-markup-list-command instead. + // If this fails as well, we just scan and return + // the escaped word. + s = lookup_markup_list_command (str); + if (scm_is_pair (s)) + token_type = MARKUP_LIST_FUNCTION; + else + return scan_escaped_word (str); + } + + // If the list of predicates is, say, + // (number? number? markup?), then tokens + // EXPECT_MARKUP EXPECT_SCM EXPECT_SCM EXPECT_NO_MORE_ARGS + // will be generated. Note that we have to push them + // in reverse order, so the first token pushed in the + // loop will be EXPECT_NO_MORE_ARGS. + + yylval.scm = scm_car(s); + + // yylval now contains the function to call as token + // value (for token type MARKUP_FUNCTION or + // MARKUP_LIST_FUNCTION). + + push_extra_token(EXPECT_NO_MORE_ARGS); + s = scm_cdr(s); + for (; scm_is_pair(s); s = scm_cdr(s)) { + SCM predicate = scm_car(s); + + if (predicate == ly_lily_module_constant ("markup-list?")) + push_extra_token(EXPECT_MARKUP_LIST); + else if (predicate == ly_lily_module_constant ("markup?")) + push_extra_token(EXPECT_MARKUP); + else + push_extra_token(EXPECT_SCM); + } + return token_type; } [{}] { return YYText ()[0]; @@ -557,7 +593,7 @@ BOM_UTF8 \357\273\277 if (c == '{' || c == '}') here_input ().warning ( _ ("Brace found at end of markup. Did you forget a space?")); - yylval.scm = scm_makfrom0str (s.c_str ()); + yylval.scm = ly_string2scm (s); return STRING; @@ -570,7 +606,11 @@ BOM_UTF8 \357\273\277 <*><> { if (is_main_input_) { - is_main_input_ = false; + /* 2 = init.ly + current file. + > because we're before closing, but is_main_input_ should + reflect after. + */ + is_main_input_ = include_stack_.size () > 2; if (!close_input ()) /* Returns YY_NULL */ yyterminate (); @@ -774,7 +814,7 @@ Lily_lexer::scan_escaped_word (string str) string msg (_f ("unknown escaped string: `\\%s'", str)); LexerError (msg.c_str ()); - yylval.scm = scm_makfrom0str (str.c_str ()); + yylval.scm = ly_string2scm (str); return STRING; } @@ -795,14 +835,18 @@ Lily_lexer::scan_bare_word (string str) else if (scm_is_symbol (yylval.scm)) return DRUM_PITCH; } - else if ((handle = scm_hashq_get_handle (chordmodifier_tab_, sym))!= SCM_BOOL_F) + else if ((YYSTATE == chords) + && (handle = scm_hashq_get_handle (chordmodifier_tab_, sym))!= SCM_BOOL_F) { yylval.scm = scm_cdr (handle); return CHORD_MODIFIER; } + if ((chord_repetition_.repetition_symbol_ != SCM_EOL) + && to_boolean (scm_equal_p (chord_repetition_.repetition_symbol_, sym))) + return CHORD_REPETITION; } - yylval.scm = scm_makfrom0str (str.c_str ()); + yylval.scm = ly_string2scm (str); return STRING; } @@ -875,12 +919,18 @@ is_valid_version (string s) { Lilypond_version current ( MAJOR_VERSION "." MINOR_VERSION "." PATCH_LEVEL ); Lilypond_version ver (s); - if (! ((ver >= oldest_version) && (ver <= current))) + if (int (ver) < oldest_version) { - 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")); + non_fatal_error (_f ("file too old: %s (oldest supported: %s)", ver.to_string (), oldest_version.to_string ())); + non_fatal_error (_ ("consider updating the input with the convert-ly script")); return false; - } + } + + if (ver > current) + { + non_fatal_error (_f ("program too old: %s (file requires: %s)", current.to_string (), ver.to_string ())); + return false; + } return true; } @@ -931,7 +981,14 @@ SCM lookup_markup_command (string s) { SCM proc = ly_lily_module_constant ("lookup-markup-command"); - return scm_call_1 (proc, scm_makfrom0str (s.c_str ())); + return scm_call_1 (proc, ly_string2scm (s)); +} + +SCM +lookup_markup_list_command (string s) +{ + SCM proc = ly_lily_module_constant ("lookup-markup-list-command"); + return scm_call_1 (proc, ly_string2scm (s)); } /* Shut up lexer warnings. */