source file of the LilyPond music typesetter
- (c) 1996--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ (c) 1996--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "interval.hh"
#include "lily-guile.hh"
#include "lily-lexer.hh"
-#include "lilypond-input-version.hh"
+#include "lilypond-version.hh"
#include "main.hh"
+#include "music.hh"
#include "music-function.hh"
#include "parse-scm.hh"
#include "parser.hh"
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);
+SCM lookup_markup_list_command (string s);
bool is_valid_version (string s);
(*(YYLTYPE*)lexloc)
#define YY_USER_ACTION add_lexed_char (YYLeng ());
-/*
-
-LYRICS ({AA}|{TEX})[^0-9 \t\n\f]*
-
-*/
SCM scan_fraction (string);
%option never-interactive
%option warn
+%x extratoken
%x chords
%x figures
%x incl
%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}+
EXTENDER __
HYPHEN --
BOM_UTF8 \357\273\277
+
%%
// windows-suck-suck-suck
}
-<INITIAL,chords,lyrics,figures,notes>{BOM_UTF8} {
+<extratoken>{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. */
+<INITIAL,chords,lyrics,figures,notes>{BOM_UTF8}/.* {
if (this->lexloc->line_number () != 1 || this->lexloc->column_number () != 0)
{
LexerError (_ ("stray UTF-8 BOM encountered").c_str ());
progress_indication ("\n");
scm_module_define (scm_car (scopes_),
ly_symbol2scm ("input-file-name"),
- scm_makfrom0str (s.c_str ()));
+ ly_string2scm (s));
}
}
<<EOF>> {
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
}
}
<chords,notes,figures>{RESTNAME} {
char const *s = YYText ();
- yylval.scm = scm_makfrom0str (s);
+ yylval.scm = scm_from_locale_string (s);
return RESTNAME;
}
<chords,notes,figures>R {
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)
{
/* 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;
}
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;
{MARKUPCOMMAND} {
string str (YYText () + 1);
SCM s = lookup_markup_command (str);
-
+ SCM s2 = lookup_markup_list_command (str);
if (scm_is_pair (s) && scm_is_symbol (scm_cdr (s)) ) {
yylval.scm = scm_car(s);
SCM tag = scm_cdr(s);
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-markup1-markup2"))
+ return MARKUP_HEAD_SCM0_MARKUP1_MARKUP2;
else if (tag == ly_symbol2scm ("scheme0-scheme1-scheme2"))
return MARKUP_HEAD_SCM0_SCM1_SCM2;
else {
ly_display_scm (s);
assert(false);
}
+ } else if (scm_is_pair (s2) && scm_is_symbol (scm_cdr (s2))) {
+ yylval.scm = scm_car(s2);
+ SCM tag = scm_cdr(s2);
+ if (tag == ly_symbol2scm("empty"))
+ return MARKUP_LIST_HEAD_EMPTY;
+ else if (tag == ly_symbol2scm ("scheme0"))
+ return MARKUP_LIST_HEAD_SCM0;
+ else if (tag == ly_symbol2scm ("markup-list0"))
+ return MARKUP_LIST_HEAD_LIST0;
+ else if (tag == ly_symbol2scm ("scheme0-markup-list1"))
+ return MARKUP_LIST_HEAD_SCM0_LIST1;
+ else if (tag == ly_symbol2scm ("scheme0-scheme1-markup-list2"))
+ return MARKUP_LIST_HEAD_SCM0_SCM1_LIST2;
+ else {
+ programming_error ("no parser tag defined for this markup list signature");
+ ly_display_scm (s);
+ assert(false);
+ }
} else
return scan_escaped_word (str);
}
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;
}
}
-<<EOF>> {
+<*><<EOF>> {
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 ();
%%
+/* 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)
{
{
if (YYSTATE == notes || YYSTATE == chords)
pitchname_tab_stack_ = scm_cdr (pitchname_tab_stack_);
+
yy_pop_state ();
}
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)
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;
}
}
}
- yylval.scm = scm_makfrom0str (str.c_str ());
+ 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;
}
/*
{
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;
}
lookup_markup_command (string s)
{
SCM proc = ly_lily_module_constant ("lookup-markup-command");
- return scm_call_1 (proc, scm_makfrom0str (s.c_str ()));
-}
-
-struct Parser_signature
-{
- char *symbol;
- int token_type;
-};
-static SCM signature_hash_table;
-
-static void init_signature_hash_table ()
-{
- signature_hash_table = scm_gc_protect_object (scm_c_make_hash_table (31));
- Parser_signature sigs[] = {
- {"scm", MUSIC_FUNCTION_SCM},
- {"music", MUSIC_FUNCTION_MUSIC},
- {"scm-music", MUSIC_FUNCTION_SCM_MUSIC},
- {"scm-scm", MUSIC_FUNCTION_SCM_SCM},
- {"music-music", MUSIC_FUNCTION_MUSIC_MUSIC},
- {"scm-music-music", MUSIC_FUNCTION_SCM_MUSIC_MUSIC},
- {"scm-scm-music-music", MUSIC_FUNCTION_SCM_SCM_MUSIC_MUSIC},
- {"scm-scm-music", MUSIC_FUNCTION_SCM_SCM_MUSIC},
- {"scm-scm-scm-music", MUSIC_FUNCTION_SCM_SCM_SCM_SCM_MUSIC},
- {"scm-scm-scm-scm-music", MUSIC_FUNCTION_SCM_SCM_SCM_MUSIC},
- {"scm-scm-scm", MUSIC_FUNCTION_SCM_SCM_SCM},
- {"markup", MUSIC_FUNCTION_MARKUP},
- {"markup-music", MUSIC_FUNCTION_MARKUP_MUSIC},
- {"markup-markup", MUSIC_FUNCTION_MARKUP_MARKUP},
- {"markup-music-music", MUSIC_FUNCTION_MARKUP_MUSIC_MUSIC},
- {"markup-markup-music", MUSIC_FUNCTION_MARKUP_MARKUP_MUSIC},
- {"noarg", MUSIC_FUNCTION},
- {0,0}
- };
-
- for (int i = 0; sigs[i].symbol; i++)
- scm_hashq_set_x (signature_hash_table, ly_symbol2scm (sigs[i].symbol),
- scm_from_int (sigs[i].token_type));
+ return scm_call_1 (proc, ly_string2scm (s));
}
-int
-music_function_type (SCM func)
+SCM
+lookup_markup_list_command (string s)
{
- if (!signature_hash_table)
- init_signature_hash_table ();
-
- SCM type = scm_object_property (func, ly_symbol2scm ("music-function-signature-keyword"));
- SCM token_type = scm_hashq_ref (signature_hash_table, type, SCM_BOOL_F);
- if (!scm_is_number (token_type))
- {
- programming_error (_ ("can't find signature for music function"));
- return MUSIC_FUNCTION_SCM;
- }
-
- return scm_to_int (token_type);
+ SCM proc = ly_lily_module_constant ("lookup-markup-list-command");
+ return scm_call_1 (proc, ly_string2scm (s));
}
/* Shut up lexer warnings. */