source file of the LilyPond music typesetter
- (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1996--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
#define yylval \
(*(YYSTYPE*)lexval)
+#define yylloc \
+ (*(YYLTYPE*)lexloc)
+
#define YY_USER_ACTION add_lexed_char (YYLeng ());
/*
%option warn
%x chords
-%x encoding
%x figures
%x incl
%x lyrics
%x lyric_quote
%x longcomment
-%x markup
+%x markup
%x notes
%x quote
%x renameinput
// windows-suck-suck-suck
}
-<INITIAL,chords,incl,markup,lyrics,notes,figures>{
+<INITIAL,chords,figures,incl,lyrics,markup,notes>{
"%{" {
yy_push_state (longcomment);
}
}
}
-<INITIAL,lyrics,figures,notes>\\encoding{WHITE}* {
- yy_push_state (encoding);
-}
<INITIAL,chords,lyrics,notes,figures>\\version{WHITE}* {
yy_push_state (version);
}
<INITIAL,chords,lyrics,notes,figures>\\renameinput{WHITE}* {
yy_push_state (renameinput);
}
-<encoding>\"[^"]*\" {
- String s (YYText () + 1);
- s = s.left_string (s.index_last ('\"'));
- set_encoding (s);
- yy_pop_state ();
-}
<version>\"[^"]*\" { /* got the version number */
String s (YYText () + 1);
s = s.left_string (s.index_last ('\"'));
yy_pop_state ();
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);
+
}
<renameinput>\"[^"]*\" {
String s (YYText () + 1);
yy_pop_state();
this->here_input().source_file_->name_ = s;
- progress_indication (_f ("Renaming input to: `%s'", s.to_str0 ()));
+ message (_f ("Renaming input to: `%s'", s.to_str0 ()));
progress_indication ("\n");
scm_module_define (scm_car (scopes_),
ly_symbol2scm ("input-file-name"),
scm_makfrom0str (s.to_str0 ()));
}
-<encoding>. {
- LexerError (_ ("No quoted string found after \\encoding").to_str0 ());
- yy_pop_state ();
-}
<version>. {
- LexerError (_ ("No quoted string found after \\version").to_str0 ());
+ LexerError (_ ("quoted string expected after \\version").to_str0 ());
yy_pop_state ();
}
<renameinput>. {
- LexerError (_ ("No quoted string found after \\renameinput").to_str0 ());
+ LexerError (_ ("quoted string expected after \\renameinput").to_str0 ());
yy_pop_state ();
}
<longcomment>{
}
<<EOF>> {
LexerError (_ ("EOF found inside a comment").to_str0 ());
- main_input_b_ = false;
+ is_main_input_ = false;
if (! close_input ())
yyterminate (); // can't move this, since it actually rets a YY_NULL
}
<INITIAL,chords,lyrics,notes,figures>\\maininput {
- if (!main_input_b_)
+ if (!is_main_input_)
{
start_main_input ();
- main_input_b_ = true;
+ is_main_input_ = true;
}
else
error (_ ("\\maininput not allowed outside init files"));
}
}
<incl>\"[^"]* { // backup rule
- error (_ ("Missing end quote"));
+ error (_ ("end quote missing"));
exit (1);
}
<chords,notes,figures>{RESTNAME} {
<chords,notes,figures>R {
return MULTI_MEASURE_REST;
}
-<INITIAL,markup,chords,lyrics,notes,figures># { //embedded scm
- //char const* s = YYText () + 1;
- char const* s = here_str0 ();
+<INITIAL,chords,figures,lyrics,markup,notes># { //embedded scm
int n = 0;
- SCM sval = ly_parse_scm (s, &n, here_input (),
- safe_global_b && main_input_b_);
+ Input hi = here_input();
+ hi.step_forward ();
+ SCM sval = ly_parse_scm (hi.start_, &n, hi,
+ be_safe_global && is_main_input_);
if (sval == SCM_UNDEFINED)
{
error_level_ = 1;
}
- for (int i=0; i < n; i++)
+ for (int i = 0; i < n; i++)
{
yyinput ();
}
\" {
start_quote ();
}
- \< {
- return '<';
- }
- \> {
- return '>';
- }
\\score {
return SCORE;
}
else if (tag == ly_symbol2scm ("scheme0-scheme1-scheme2"))
return MARKUP_HEAD_SCM0_SCM1_SCM2;
else {
- programming_error ("No parser tag defined for this signature. Abort");
+ programming_error ("no parser tag defined for this signature");
ly_display_scm (s);
assert(false);
}
}
<<EOF>> {
- if (main_input_b_)
+ if (is_main_input_)
{
- main_input_b_ = false;
+ is_main_input_ = false;
if (!close_input ())
/* Returns YY_NULL */
yyterminate ();
}
{REAL} {
Real r;
- int cnv=sscanf (YYText (), "%lf", &r);
+ int cnv = sscanf (YYText (), "%lf", &r);
assert (cnv == 1);
yylval.scm = scm_make_real (r);
}
<INITIAL,lyrics,notes,figures>\\. {
- char c= YYText ()[1];
+ char c = YYText ()[1];
switch (c) {
case '>':
- return E_BIGGER;
+ return E_ANGLE_CLOSE;
case '<':
- return E_SMALLER;
+ return E_ANGLE_OPEN;
case '!':
return E_EXCLAMATION;
case '(':
case ')':
return E_CLOSE;
case '[':
- return E_LEFTSQUARE;
+ return E_BRACKET_OPEN;
case ']':
- return E_RIGHTSQUARE;
+ return E_BRACKET_CLOSE;
case '~':
return E_TILDE;
case '\\':
// SCM sym = ly_symbol2scm (str.to_str0 ());
- int l = lookup_keyword (str);
- if (l != -1) {
- return l;
- }
+ int i = lookup_keyword (str);
+ if (i == MARKUP && is_lyric_state ())
+ return LYRIC_MARKUP;
+ if (i != -1)
+ return i;
+
SCM sid = lookup_identifier (str);
if (is_music_function (sid))
{
yylval.scm = get_music_function_transform (sid);
-
return music_function_type (yylval.scm);
}
void
strip_leading_white (String&s)
{
- int i=0;
+ int i = 0;
for (; i < s.length (); i++)
if (!isspace (s[i]))
break;
void
strip_trailing_white (String&s)
{
- int i=s.length ();
+ int i = s.length ();
while (i--)
if (!isspace (s[i]))
break;
String
lyric_fudge (String s)
{
- char * chars =s.get_copy_str0 ();
+ char * chars = s.get_copy_str0 ();
for (char * p = chars; *p ; p++)
{
s = String (chars);
delete[] chars;
- int i =0;
- if ((i=s.index ("\\,")) != -1) // change "\," to TeX's "\c "
+ int i = 0;
+ if ((i = s.index ("\\,")) != -1) // change "\," to TeX's "\c "
{
* (s.get_str0 () + i + 1) = 'c';
s = s.left_string (i+2) + " " + s.right_string (s.length ()-i-2);
SCM
lookup_markup_command (String s)
{
- SCM proc = ly_scheme_function ("lookup-markup-command");
+ SCM proc = ly_lily_module_constant ("lookup-markup-command");
return scm_call_1 (proc, scm_makfrom0str (s.to_str0 ()));
}
int
music_function_type (SCM func)
{
- SCM type= scm_object_property (func, ly_symbol2scm ("music-function-signature-keyword"));
+ SCM type = scm_object_property (func, ly_symbol2scm ("music-function-signature-keyword"));
if (type == ly_symbol2scm ("scm"))
{
return MUSIC_FUNCTION_SCM;
else
{
/* TODO: print location */
- error ("Can not find signature for music function.");
+ error (_ ("can't find signature for music function"));
}
return MUSIC_FUNCTION_SCM;