X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flexer.ll;h=882418242d9d4ce8577ee81069a22d8ef75f5675;hb=e90f0536f9be39ada0bef0aeb0d275dec3b2fb5b;hp=a5fbdb6a94473bfb6ef976912a13973844e6a807;hpb=4ecdbd7d70ca7441be4dddd15ac01cc255bc2a35;p=lilypond.git diff --git a/lily/lexer.ll b/lily/lexer.ll index a5fbdb6a94..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--2005 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 @@ -35,59 +45,56 @@ #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 "lily-lexer.hh" +#include "context-def.hh" +#include "identifier-smob.hh" +#include "international.hh" #include "interval.hh" #include "lily-guile.hh" -#include "parser.hh" -#include "warn.hh" +#include "lily-lexer.hh" +#include "lily-parser.hh" +#include "lilypond-version.hh" #include "main.hh" +#include "music.hh" +#include "music-function.hh" +#include "parse-scm.hh" +#include "parser.hh" +#include "source-file.hh" +#include "std-string.hh" +#include "string-convert.hh" #include "version.hh" -#include "lilypond-input-version.hh" -#include "context-def.hh" -#include "identifier-smob.hh" +#include "warn.hh" /* RH 7 fix (?) */ #define isatty HORRIBLEKLUDGE -void strip_trailing_white (String&); -void strip_leading_white (String&); -String lyric_fudge (String s); -int music_function_type (SCM); -SCM lookup_markup_command (String s); -bool is_valid_version (String s); +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); #define start_quote() \ yy_push_state (quote);\ - yylval.string = new String + yylval.string = new string #define start_lyric_quote() \ yy_push_state (lyric_quote);\ - yylval.string = new String + yylval.string = new string #define yylval \ - (*(YYSTYPE*)lexval) + (*(YYSTYPE*)lexval_) #define yylloc \ - (*(YYLTYPE*)lexloc) + (*(YYLTYPE*)lexloc_) #define YY_USER_ACTION add_lexed_char (YYLeng ()); -/* - -LYRICS ({AA}|{TEX})[^0-9 \t\n\f]* - -*/ -SCM scan_fraction (String); +SCM scan_fraction (string); SCM (* scm_parse_error_handler) (void *); @@ -103,6 +110,7 @@ SCM (* scm_parse_error_handler) (void *); %option never-interactive %option warn +%x extratoken %x chords %x figures %x incl @@ -112,18 +120,25 @@ SCM (* scm_parse_error_handler) (void *); %x markup %x notes %x quote -%x renameinput +%x sourcefileline +%x sourcefilename %x version -A [a-zA-Z] +A [a-zA-Z\200-\377] AA {A}|_ N [0-9] AN {AA}|{N} +ANY_CHAR (.|\n) PUNCT [?!:'`] ACCENT \\[`'"^] -NATIONAL [\001-\006\021-\027\031\036\200-\377] +NATIONAL [\001-\006\021-\027\031\036] TEX {AA}|-|{PUNCT}|{ACCENT}|{NATIONAL} WORD {A}{AN}* +DASHED_WORD {A}({AN}|-)* +DASHED_KEY_WORD \\{DASHED_WORD} + + + ALPHAWORD {A}+ DIGIT {N} UNSIGNED {N}+ @@ -143,6 +158,7 @@ ESCAPED [nt\\'"] EXTENDER __ HYPHEN -- BOM_UTF8 \357\273\277 + %% @@ -150,10 +166,28 @@ BOM_UTF8 \357\273\277 // windows-suck-suck-suck } -{BOM_UTF8} { - if (this->lexloc->line_number () != 1 || this->lexloc->column_number () != 0) +{ANY_CHAR} { + /* Generate a token without swallowing anything */ + + /* First unswallow the eaten character */ + add_lexed_char (-YYLeng ()); + yyless (0); + + /* produce requested token */ + int type = extra_token_types_.back (); + extra_token_types_.pop_back (); + if (extra_token_types_.empty ()) + yy_pop_state (); + + return type; +} + + /* 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").to_str0 ()); + LexerError (_ ("stray UTF-8 BOM encountered").c_str ()); exit (1); } if (be_verbose_global) @@ -164,56 +198,80 @@ 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}+ { } } +{ + \" { + start_quote (); + } +} + \\version{WHITE}* { yy_push_state (version); } -\\renameinput{WHITE}* { - yy_push_state (renameinput); +\\sourcefilename{WHITE}* { + yy_push_state (sourcefilename); +} +\\sourcefileline{WHITE}* { + yy_push_state (sourcefileline); } \"[^"]*\" { /* got the version number */ - String s (YYText () + 1); - s = s.left_string (s.index_last ('\"')); + string s (YYText () + 1); + s = s.substr (0, s.rfind ('\"')); yy_pop_state (); + + SCM top_scope = scm_car (scm_last_pair (scopes_)); + scm_module_define (top_scope, ly_symbol2scm ("version-seen"), SCM_BOOL_T); + 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); } -\"[^"]*\" { - String s (YYText () + 1); - s = s.left_string (s.index_last ('\"')); +\"[^"]*\" { + string s (YYText () + 1); + s = s.substr (0, s.rfind ('\"')); yy_pop_state (); this->here_input().get_source_file ()->name_ = s; - message (_f ("Renaming input to: `%s'", s.to_str0 ())); + message (_f ("Renaming input to: `%s'", s.c_str ())); progress_indication ("\n"); scm_module_define (scm_car (scopes_), ly_symbol2scm ("input-file-name"), - scm_makfrom0str (s.to_str0 ())); + ly_string2scm (s)); } + +{INT} { + int i; + sscanf (YYText (), "%d", &i); + + yy_pop_state (); + this->here_input ().get_source_file ()->set_line (here_input ().start (), i); +} + . { - LexerError (_ ("quoted string expected after \\version").to_str0 ()); + LexerError (_ ("quoted string expected after \\version").c_str ()); yy_pop_state (); } -. { - LexerError (_ ("quoted string expected after \\renameinput").to_str0 ()); +. { + LexerError (_ ("quoted string expected after \\sourcefilename").c_str ()); + yy_pop_state (); +} +. { + LexerError (_ ("integer expected after \\sourcefileline").c_str ()); yy_pop_state (); } { @@ -226,8 +284,8 @@ BOM_UTF8 \357\273\277 yy_pop_state (); } <> { - LexerError (_ ("EOF found inside a comment").to_str0 ()); - is_main_input_ = false; + LexerError (_ ("EOF found inside a comment").c_str ()); + 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 } @@ -248,26 +306,26 @@ BOM_UTF8 \357\273\277 yy_push_state (incl); } \"[^"]*\" { /* got the include file name */ - String s (YYText ()+1); - s = s.left_string (s.index_last ('"')); + string s (YYText ()+1); + s = s.substr (0, s.rfind ('"')); new_input (s, sources_); yy_pop_state (); } \\{BLACK}*{WHITE} { /* got the include identifier */ - String s = YYText () + 1; + string s = YYText () + 1; strip_trailing_white (s); if (s.length () && (s[s.length () - 1] == ';')) - s = s.left_string (s.length () - 1); + s = s.substr (0, s.length () - 1); SCM sid = lookup_identifier (s); if (scm_is_string (sid)) { new_input (ly_scm2string (sid), sources_); yy_pop_state (); } else { - String msg (_f ("wrong or undefined identifier: `%s'", s )); + string msg (_f ("wrong or undefined identifier: `%s'", s )); - LexerError (msg.to_str0 ()); + LexerError (msg.c_str ()); SCM err = scm_current_error_port (); scm_puts ("This value was found in the table: ", err); scm_display (sid, err); @@ -279,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 { @@ -290,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) { @@ -302,25 +360,40 @@ BOM_UTF8 \357\273\277 { yyinput (); } - char_count_stack_.top () += n; + char_count_stack_.back () += n; if (unpack_identifier (sval) != SCM_UNDEFINED) { 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_T; + return SCM_TOKEN; } { - \<\< { + \<\< { return DOUBLE_ANGLE_OPEN; } - \>\> { + \>\> { return DOUBLE_ANGLE_CLOSE; } } + +{ + \< { + return ANGLE_OPEN; + } + \> { + return ANGLE_CLOSE; + } +} + { _ { return FIGURE_SPACE; @@ -347,30 +420,24 @@ BOM_UTF8 \357\273\277 } {DIGIT} { - yylval.i = String_convert::dec2int (String (YYText ())); + yylval.i = String_convert::dec2int (string (YYText ())); return DIGIT; } {UNSIGNED} { - yylval.i = String_convert::dec2int (String (YYText ())); + yylval.i = String_convert::dec2int (string (YYText ())); return UNSIGNED; } {E_UNSIGNED} { - yylval.i = String_convert::dec2int (String (YYText () +1)); + yylval.i = String_convert::dec2int (string (YYText () +1)); return E_UNSIGNED; } - \" { - start_quote (); - } } -\" { - start_quote (); -} -{ +{ \\{ESCAPED} { *yylval.string += to_string (escaped_char (YYText ()[1])); } - [^\\"]+ { + [^\\""]+ { *yylval.string += YYText (); } \" { @@ -378,31 +445,10 @@ BOM_UTF8 \357\273\277 yy_pop_state (); /* yylval is union. Must remember STRING before setting SCM*/ - String *sp = yylval.string; - yylval.scm = scm_makfrom0str (sp->to_str0 ()); + string *sp = yylval.string; + yylval.scm = ly_string2scm (*sp); delete sp; - return STRING; - } - . { - *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; + return is_lyric_state () ? LYRICS_STRING : STRING; } . { *yylval.string += YYText (); @@ -418,7 +464,7 @@ BOM_UTF8 \357\273\277 return FRACTION; } {UNSIGNED} { - yylval.i = String_convert::dec2int (String (YYText ())); + yylval.i = String_convert::dec2int (string (YYText ())); return UNSIGNED; } {NOTECOMMAND} { @@ -426,7 +472,7 @@ BOM_UTF8 \357\273\277 } {LYRICS} { /* ugr. This sux. */ - String s (YYText ()); + string s (YYText ()); if (s == "__") return yylval.i = EXTENDER; if (s == "--") @@ -437,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.to_str0 ()); + yylval.scm = ly_string2scm (s); return LYRICS_STRING; @@ -458,12 +504,9 @@ BOM_UTF8 \357\273\277 return FRACTION; } {UNSIGNED} { - yylval.i = String_convert::dec2int (String (YYText ())); + yylval.i = String_convert::dec2int (string (YYText ())); return UNSIGNED; } - \" { - start_quote (); - } - { return CHORD_MINUS; } @@ -486,57 +529,71 @@ BOM_UTF8 \357\273\277 { - \" { - start_quote (); - } \\score { return SCORE; } {MARKUPCOMMAND} { - String str (YYText () + 1); + 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 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]; } [^#{}"\\ \t\n\r\f]+ { - String s (YYText ()); + string s (YYText ()); char c = s[s.length () - 1]; /* 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 ()); + yylval.scm = ly_string2scm (s); return STRING; @@ -546,10 +603,14 @@ 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 (); @@ -559,6 +620,14 @@ BOM_UTF8 \357\273\277 yyterminate (); } +{ + {DASHED_WORD} { + return scan_bare_word (YYText ()); + } + {DASHED_KEY_WORD} { + return scan_escaped_word (YYText () + 1); + } +} {WORD} { return scan_bare_word (YYText ()); @@ -570,13 +639,14 @@ BOM_UTF8 \357\273\277 Real r; int cnv = sscanf (YYText (), "%lf", &r); assert (cnv == 1); + (void) cnv; yylval.scm = scm_from_double (r); return REAL; } {UNSIGNED} { - yylval.i = String_convert::dec2int (String (YYText ())); + yylval.i = String_convert::dec2int (string (YYText ())); return UNSIGNED; } @@ -611,6 +681,8 @@ BOM_UTF8 \357\273\277 return E_CLOSE; case '[': return E_BRACKET_OPEN; + case '+': + return E_PLUS; case ']': return E_BRACKET_CLOSE; case '~': @@ -624,13 +696,27 @@ BOM_UTF8 \357\273\277 } <*>. { - String msg = _f ("invalid character: `%c'", YYText ()[0]); - LexerError (msg.to_str0 ()); + string msg = _f ("invalid character: `%c'", YYText ()[0]); + LexerError (msg.c_str ()); return YYText ()[0]; } %% +/* Make the lexer generate a token of the given type as the next token. + TODO: make it possible to define a value for the token as well */ +void +Lily_lexer::push_extra_token (int token_type) +{ + if (extra_token_types_.empty ()) + { + if (YY_START != extratoken) + hidden_state_ = YY_START; + yy_push_state (extratoken); + } + extra_token_types_.push_back (token_type); +} + void Lily_lexer::push_chord_state (SCM tab) { @@ -674,6 +760,7 @@ Lily_lexer::pop_state () { if (YYSTATE == notes || YYSTATE == chords) pitchname_tab_stack_ = scm_cdr (pitchname_tab_stack_); + yy_pop_state (); } @@ -686,11 +773,11 @@ Lily_lexer::identifier_type (SCM sid) int -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.c_str ()); int i = lookup_keyword (str); if (i == MARKUP && is_lyric_state ()) @@ -702,7 +789,20 @@ Lily_lexer::scan_escaped_word (String str) if (is_music_function (sid)) { yylval.scm = get_music_function_transform (sid); - return music_function_type (yylval.scm); + + SCM s = scm_object_property (yylval.scm, ly_symbol2scm ("music-function-signature")); + push_extra_token (EXPECT_NO_MORE_ARGS); + for (; scm_is_pair (s); s = scm_cdr (s)) + { + if (scm_car (s) == ly_music_p_proc) + push_extra_token (EXPECT_MUSIC); + else if (scm_car (s) == ly_lily_module_constant ("markup?")) + push_extra_token (EXPECT_MARKUP); + else if (ly_is_procedure (scm_car (s))) + push_extra_token (EXPECT_SCM); + else programming_error ("Function parameter without type-checking predicate"); + } + return MUSIC_FUNCTION; } if (sid != SCM_UNDEFINED) @@ -711,18 +811,18 @@ Lily_lexer::scan_escaped_word (String str) return identifier_type (sid); } - String msg (_f ("unknown escaped string: `\\%s'", str)); - LexerError (msg.to_str0 ()); + string msg (_f ("unknown escaped string: `\\%s'", str)); + LexerError (msg.c_str ()); - yylval.scm = scm_makfrom0str (str.to_str0 ()); + yylval.scm = ly_string2scm (str); return STRING; } int -Lily_lexer::scan_bare_word (String str) +Lily_lexer::scan_bare_word (string str) { - SCM sym = ly_symbol2scm (str.to_str0 ()); + SCM sym = ly_symbol2scm (str.c_str ()); if ((YYSTATE == notes) || (YYSTATE == chords)) { SCM handle = SCM_BOOL_F; if (scm_is_pair (pitchname_tab_stack_)) @@ -735,84 +835,102 @@ 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.to_str0 ()); + yylval.scm = ly_string2scm (str); return STRING; } +int +Lily_lexer::get_state () const +{ + if (YY_START == extratoken) + return hidden_state_; + else + return YY_START; +} + bool Lily_lexer::is_note_state () const { - return YY_START == notes; + return get_state () == notes; } bool Lily_lexer::is_chord_state () const { - return YY_START == chords; + return get_state () == chords; } bool Lily_lexer::is_lyric_state () const { - return YY_START == lyrics; + return get_state () == lyrics; } bool Lily_lexer::is_figure_state () const { - return YY_START == figures; + return get_state () == figures; } /* - urg, belong to String (_convert) + urg, belong to string (_convert) and should be generalised */ void -strip_leading_white (String&s) +strip_leading_white (string&s) { - int i = 0; - for (; i < s.length (); i++) + ssize i = 0; + for (; i < s.length (); i++) if (!isspace (s[i])) break; - s = s.nomid_string (0, i); + s = s.substr (i); } void -strip_trailing_white (String&s) +strip_trailing_white (string&s) { - int i = s.length (); + ssize i = s.length (); while (i--) if (!isspace (s[i])) break; - s = s.left_string (i+1); + s = s.substr (0, i + 1); } -/* 2.1.2x something -> \property -> \set. */ -Lilypond_version oldest_version ("2.3.22"); +Lilypond_version oldest_version ("2.7.38"); bool -is_valid_version (String s) +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; } @@ -820,25 +938,25 @@ is_valid_version (String s) /* substitute _ and \, */ -String -lyric_fudge (String s) +string +lyric_fudge (string s) { - char * chars = s.get_copy_str0 (); + char *chars = string_copy (s); - for (char * p = chars; *p ; p++) + for (char *p = chars; *p ; p++) { if (*p == '_' && (p == chars || *(p-1) != '\\')) *p = ' '; } - s = String (chars); + s = string (chars); delete[] chars; - int i = 0; - if ((i = s.index ("\\,")) != -1) // change "\," to TeX's "\c " + ssize i = 0; + if ((i = s.find ("\\,")) != NPOS) // change "\," to TeX's "\c " { - * (s.get_str0 () + i + 1) = 'c'; - s = s.left_string (i+2) + " " + s.right_string (s.length ()-i-2); + * (((char*)s.c_str ()) + i + 1) = 'c'; + s = s.substr (0, i + 2) + " " + s.substr (i - 2); } return s; @@ -848,109 +966,29 @@ lyric_fudge (String s) Convert "NUM/DEN" into a '(NUM . DEN) cons. */ SCM -scan_fraction (String frac) +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); + ssize i = frac.find ('/'); + string left = frac.substr (0, i); + string right = frac.substr (i + 1, (frac.length () - i + 1)); int n = String_convert::dec2int (left); int d = String_convert::dec2int (right); 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; } - -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) +lookup_markup_command (string s) { SCM proc = ly_lily_module_constant ("lookup-markup-command"); - return scm_call_1 (proc, scm_makfrom0str (s.to_str0 ())); + return scm_call_1 (proc, ly_string2scm (s)); } - -int -music_function_type (SCM func) +SCM +lookup_markup_list_command (string s) { - 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 ("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; + SCM proc = ly_lily_module_constant ("lookup-markup-list-command"); + return scm_call_1 (proc, ly_string2scm (s)); } /* Shut up lexer warnings. */