X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flexer.ll;h=bfd2449e6b3e23ba2ec88b7a509791851fef2751;hb=4402d15b615cd29241ebaa99c0fa667c22e1f2b8;hp=66da12433604f8a484564883fc057ae0bda8ffb8;hpb=97b1468ebd1611364731b53a1bd81a2a69402d60;p=lilypond.git diff --git a/lily/lexer.ll b/lily/lexer.ll index 66da124336..bfd2449e6b 100644 --- a/lily/lexer.ll +++ b/lily/lexer.ll @@ -2,7 +2,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 1996--2014 Han-Wen Nienhuys + Copyright (C) 1996--2015 Han-Wen Nienhuys Jan Nieuwenhuizen LilyPond is free software: you can redistribute it and/or modify @@ -30,9 +30,9 @@ /* backup rules - after making a change to the lexer rules, run + after making a change to the lexer rules, run flex -b - and make sure that + and make sure that lex.backup contains no backup states, but only the reminder Compressed tables always back up. @@ -69,9 +69,9 @@ using namespace std; #include "pitch.hh" #include "source-file.hh" #include "std-string.hh" -#include "string-convert.hh" #include "version.hh" #include "warn.hh" +#include "lily-imports.hh" /* RH 7 fix (?) @@ -120,7 +120,7 @@ SCM (* scm_parse_error_handler) (void *); %option debug %option yyclass="Lily_lexer" %option stack -%option never-interactive +%option never-interactive %option warn %x chords @@ -188,7 +188,7 @@ BOM_UTF8 \357\273\277 /* 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) + if (lexloc_->line_number () != 1 || lexloc_->column_number () != 0) { LexerWarning (_ ("stray UTF-8 BOM encountered").c_str ()); // exit (1); @@ -244,7 +244,7 @@ BOM_UTF8 \357\273\277 s = s.substr (0, s.rfind ('\"')); yy_pop_state (); - this->here_input().get_source_file ()->name_ = s; + here_input().get_source_file ()->name_ = s; message (_f ("Renaming input to: `%s'", s.c_str ())); progress_indication ("\n"); scm_module_define (scm_car (scopes_), @@ -258,7 +258,7 @@ BOM_UTF8 \357\273\277 sscanf (YYText (), "%d", &i); yy_pop_state (); - this->here_input ().get_source_file ()->set_line (here_input ().start (), i); + here_input ().get_source_file ()->set_line (here_input ().start (), i); } {ANY_CHAR} { @@ -347,7 +347,7 @@ BOM_UTF8 \357\273\277 yy_pop_state (); } else { LexerError (_ ("string expected after \\include").c_str ()); - if (sval != SCM_UNDEFINED) { + if (!SCM_UNBNDP (sval)) { SCM err = scm_current_error_port (); scm_puts ("This value was found instead: ", err); scm_display (sval, err); @@ -369,7 +369,7 @@ BOM_UTF8 \357\273\277 {RESTNAME}/[-_] | // pseudo backup rule {RESTNAME} { char const *s = YYText (); - yylval = scm_from_locale_string (s); + yylval = scm_from_ascii_string (s); return RESTNAME; } q/[-_] | // pseudo backup rule @@ -388,7 +388,7 @@ BOM_UTF8 \357\273\277 hi.step_forward (); SCM sval = ly_parse_scm (hi, be_safe_global && is_main_input_, parser_); - if (sval == SCM_UNDEFINED) + if (SCM_UNBNDP (sval)) error_level_ = 1; int n = hi.end () - hi.start (); @@ -422,7 +422,7 @@ BOM_UTF8 \357\273\277 return token; } -{ +{ \<\< { yylval = SCM_UNSPECIFIED; return DOUBLE_ANGLE_OPEN; @@ -433,7 +433,7 @@ BOM_UTF8 \357\273\277 } } -{ +{ \< { yylval = SCM_UNSPECIFIED; return ANGLE_OPEN; @@ -509,11 +509,11 @@ BOM_UTF8 \357\273\277 { \\{ESCAPED} { char c = escaped_char (YYText ()[1]); - yylval = scm_cons (scm_from_locale_stringn (&c, 1), + yylval = scm_cons (scm_from_ascii_stringn (&c, 1), yylval); } [^\\""]+ { - yylval = scm_cons (scm_from_locale_string (YYText_utf8 ()), + yylval = scm_cons (scm_from_utf8_string (YYText_utf8 ()), yylval); } \" { @@ -534,7 +534,7 @@ BOM_UTF8 \357\273\277 return STRING; } \\ { - yylval = scm_cons (scm_from_locale_string (YYText ()), + yylval = scm_cons (scm_from_ascii_string (YYText ()), yylval); } } @@ -689,9 +689,9 @@ BOM_UTF8 \357\273\277 for (; scm_is_pair(s); s = scm_cdr(s)) { SCM predicate = scm_car(s); - if (predicate == ly_lily_module_constant ("markup-list?")) + if (predicate == Lily::markup_list_p) push_extra_token (here_input (), EXPECT_MARKUP_LIST); - else if (predicate == ly_lily_module_constant ("markup?")) + else if (predicate == Lily::markup_p) push_extra_token (here_input (), EXPECT_MARKUP); else push_extra_token (here_input (), EXPECT_SCM, predicate); @@ -810,12 +810,12 @@ BOM_UTF8 \357\273\277 %% -/* Make the lexer generate a token of the given type as the next token. +/* 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 (Input const &where, int token_type, SCM scm) { - extra_tokens_ = scm_cons (scm_cons2 (make_input (where), + extra_tokens_ = scm_cons (scm_cons2 (where.smobbed_copy (), scm_from_int (token_type), scm), extra_tokens_); } @@ -827,7 +827,7 @@ Lily_lexer::pop_extra_token () return -1; /* produce requested token */ - yylloc = *unsmob_input (scm_caar (extra_tokens_)); + yylloc = *unsmob (scm_caar (extra_tokens_)); int type = scm_to_int (scm_cadar (extra_tokens_)); yylval = scm_cddar (extra_tokens_); extra_tokens_ = scm_cdr (extra_tokens_); @@ -914,15 +914,15 @@ Lily_lexer::scan_escaped_word (const string &str) return i; SCM sid = lookup_identifier (str); - if (Music *m = unsmob_music (sid)) + if (Music *m = unsmob (sid)) { m->set_spot (override_input (here_input ())); } - if (sid != SCM_UNDEFINED) + if (!SCM_UNBNDP (sid)) return scan_scm_id (sid); - string msg (_f ("unknown escaped string: `\\%s'", str)); + string msg (_f ("unknown escaped string: `\\%s'", str)); LexerError (msg.c_str ()); yylval = ly_string2scm (str); @@ -934,15 +934,15 @@ int Lily_lexer::scan_shorthand (const string &str) { SCM sid = lookup_identifier (str); - if (Music *m = unsmob_music (sid)) + if (Music *m = unsmob (sid)) { m->set_spot (override_input (here_input ())); } - if (sid != SCM_UNDEFINED) + if (!SCM_UNBNDP (sid)) return scan_scm_id (sid); - string msg (_f ("undefined character or shorthand: %s", str)); + string msg (_f ("undefined character or shorthand: %s", str)); LexerError (msg.c_str ()); yylval = ly_string2scm (str); @@ -953,13 +953,13 @@ Lily_lexer::scan_shorthand (const string &str) int Lily_lexer::scan_scm_id (SCM sid) { - if (is_music_function (sid)) + if (Music_function *fun = unsmob (sid)) { int funtype = SCM_FUNCTION; yylval = sid; - SCM s = get_music_function_signature (sid); + SCM s = fun->get_signature (); SCM cs = scm_car (s); if (scm_is_pair (cs)) @@ -967,9 +967,9 @@ Lily_lexer::scan_scm_id (SCM sid) cs = SCM_CAR (cs); } - if (scm_is_eq (cs, ly_lily_module_constant ("ly:music?"))) + if (scm_is_eq (cs, Lily::ly_music_p)) funtype = MUSIC_FUNCTION; - else if (scm_is_eq (cs, ly_lily_module_constant ("ly:event?"))) + else if (scm_is_eq (cs, Lily::ly_event_p)) funtype = EVENT_FUNCTION; else if (ly_is_procedure (cs)) funtype = SCM_FUNCTION; @@ -986,7 +986,7 @@ Lily_lexer::scan_scm_id (SCM sid) optional = SCM_CDR (cs); cs = SCM_CAR (cs); } - + if (ly_is_procedure (cs)) push_extra_token (here_input (), EXPECT_SCM, cs); else @@ -1011,16 +1011,16 @@ Lily_lexer::scan_bare_word (const string &str) SCM handle = SCM_BOOL_F; if (scm_is_pair (pitchname_tab_stack_)) handle = scm_hashq_get_handle (scm_cdar (pitchname_tab_stack_), sym); - + if (scm_is_pair (handle)) { yylval = scm_cdr (handle); - if (unsmob_pitch (yylval)) + if (unsmob (yylval)) return (YYSTATE == notes) ? NOTENAME_PITCH : TONICNAME_PITCH; else if (scm_is_symbol (yylval)) return DRUM_PITCH; } else if ((YYSTATE == chords) - && (handle = scm_hashq_get_handle (chordmodifier_tab_, sym))!= SCM_BOOL_F) + && scm_is_true (handle = scm_hashq_get_handle (chordmodifier_tab_, sym))) { yylval = scm_cdr (handle); return CHORD_MODIFIER; @@ -1096,12 +1096,12 @@ Lily_lexer::eval_scm (SCM readerdata, Input hi, char extra_token) p = scm_cdr (p)) { SCM v = scm_car (p); - if (Music *m = unsmob_music (v)) + if (Music *m = unsmob (v)) { - if (!unsmob_input (m->get_property ("origin"))) + if (!unsmob (m->get_property ("origin"))) m->set_spot (override_input (here_input ())); } - + int token; switch (extra_token) { case '$': @@ -1121,9 +1121,9 @@ Lily_lexer::eval_scm (SCM readerdata, Input hi, char extra_token) sval = SCM_UNSPECIFIED; } - if (Music *m = unsmob_music (sval)) + if (Music *m = unsmob (sval)) { - if (!unsmob_input (m->get_property ("origin"))) + if (!unsmob (m->get_property ("origin"))) m->set_spot (override_input (here_input ())); } @@ -1241,7 +1241,7 @@ Lily_lexer::YYText_utf8 () /* urg, belong to string (_convert) - and should be generalised + and should be generalised */ void strip_leading_white (string&s) @@ -1257,8 +1257,8 @@ strip_leading_white (string&s) void strip_trailing_white (string&s) { - ssize i = s.length (); - while (i--) + ssize i = s.length (); + while (i--) if (!isspace (s[i])) break; @@ -1275,8 +1275,13 @@ is_valid_version (string s) { Lilypond_version current ( MAJOR_VERSION "." MINOR_VERSION "." PATCH_LEVEL ); Lilypond_version ver (s); - if (int (ver) < oldest_version) - { + if (!ver) + { + non_fatal_error (_f ("Invalid version string \"%s\"", s)); + return false; + } + if (ver < oldest_version) + { 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; @@ -1289,7 +1294,7 @@ is_valid_version (string s) } return true; } - + /* substitute _ @@ -1316,23 +1321,20 @@ scan_fraction (string frac) 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)); + return scm_cons (scm_c_read_string (left.c_str ()), + scm_c_read_string (right.c_str ())); } SCM lookup_markup_command (string s) { - SCM proc = ly_lily_module_constant ("lookup-markup-command"); - return scm_call_1 (proc, ly_string2scm (s)); + return Lily::lookup_markup_command (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)); + return Lily::lookup_markup_list_command (ly_string2scm (s)); } /* Shut up lexer warnings. */