#include "lily-lexer.hh"
#include "lilypond-input-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);
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 markup
%x notes
%x quote
+%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}+
EXTENDER __
HYPHEN --
BOM_UTF8 \357\273\277
+
%%
// windows-suck-suck-suck
}
+<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;
+}
+
<INITIAL,chords,lyrics,figures,notes>{BOM_UTF8} {
if (this->lexloc->line_number () != 1 || this->lexloc->column_number () != 0)
{
}
}
+<INITIAL,notes,figures,chords,markup>{
+ \" {
+ start_quote ();
+ }
+}
+
<INITIAL,chords,lyrics,notes,figures>\\version{WHITE}* {
yy_push_state (version);
}
<INITIAL,chords,lyrics,notes,figures>\\sourcefilename{WHITE}* {
yy_push_state (sourcefilename);
}
+<INITIAL,chords,lyrics,notes,figures>\\sourcefileline{WHITE}* {
+ yy_push_state (sourcefileline);
+}
<version>\"[^"]*\" { /* got the version number */
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);
}
<sourcefilename>\"[^"]*\" {
scm_makfrom0str (s.c_str ()));
}
+
+<sourcefileline>{INT} {
+ int i;
+ sscanf (YYText (), "%d", &i);
+
+ yy_pop_state ();
+ this->here_input ().get_source_file ()->set_line (here_input ().start (), i);
+}
+
<version>. {
LexerError (_ ("quoted string expected after \\version").c_str ());
yy_pop_state ();
LexerError (_ ("quoted string expected after \\sourcefilename").c_str ());
yy_pop_state ();
}
+<sourcefileline>. {
+ LexerError (_ ("integer expected after \\sourcefileline").c_str ());
+ yy_pop_state ();
+}
<longcomment>{
[^\%]* {
}
}
yylval.scm = sval;
- return SCM_T;
+ return SCM_TOKEN;
}
<INITIAL,notes,lyrics>{
- \<\< {
+ \<\< {
return DOUBLE_ANGLE_OPEN;
}
- \>\> {
+ \>\> {
return DOUBLE_ANGLE_CLOSE;
}
}
+
+<INITIAL,notes>{
+ \< {
+ return ANGLE_OPEN;
+ }
+ \> {
+ return ANGLE_CLOSE;
+ }
+}
+
<figures>{
_ {
return FIGURE_SPACE;
yylval.i = String_convert::dec2int (string (YYText () +1));
return E_UNSIGNED;
}
- \" {
- start_quote ();
- }
}
-\" {
- start_quote ();
-}
-<quote>{
- \\{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->c_str ());
- delete sp;
- return STRING;
- }
- . {
- *yylval.string += YYText ();
- }
-}
-<lyric_quote>{
+<quote,lyric_quote>{
\\{ESCAPED} {
*yylval.string += to_string (escaped_char (YYText ()[1]));
}
string *sp = yylval.string;
yylval.scm = scm_makfrom0str (sp->c_str ());
delete sp;
- return LYRICS_STRING;
+ return is_lyric_state () ? LYRICS_STRING : STRING;
}
. {
*yylval.string += YYText ();
yylval.i = String_convert::dec2int (string (YYText ()));
return UNSIGNED;
}
- \" {
- start_quote ();
- }
- {
return CHORD_MINUS;
}
<markup>{
- \" {
- start_quote ();
- }
\\score {
return SCORE;
}
}
}
-<<EOF>> {
+<*><<EOF>> {
if (is_main_input_)
{
is_main_input_ = false;
%%
+/* 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)
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;
}
/*
-/* 2.1.2x something -> \property -> \set. */
-Lilypond_version oldest_version ("2.3.22");
+Lilypond_version oldest_version ("2.7.38");
bool
return scm_call_1 (proc, scm_makfrom0str (s.c_str ()));
}
-
-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
projects / lilypond.git / blobdiff