/* Flex >= 2.5.29 fix; FlexLexer.h's multiple include bracing breaks
when building the actual lexer. */
+
#define LEXER_CC
#include <iostream>
+
using namespace std;
+
#include "music-function.hh"
#include "source-file.hh"
#include "parse-scm.hh"
%option warn
%x chords
-%x encoding
%x figures
%x incl
%x lyrics
}
}
-<INITIAL,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);
+ String s (YYText () + 1);
s = s.left_string (s.index_last ('\"'));
yy_pop_state();
this->here_input().source_file_->name_ = s;
+ progress_indication (_f ("Renaming input to: `%s'", s.to_str0 ()));
progress_indication ("\n");
- progress_indication (_f ("input renamed to: `%s'", s.to_str0 ()));
- progress_indication ("\n");
- scm_module_define (ly_car (scopes_),
+ scm_module_define (scm_car (scopes_),
ly_symbol2scm ("input-file-name"),
- scm_makfrom0str (s.to_str0()));
+ 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 ());
yy_pop_state ();
<INITIAL,chords,lyrics,figures,notes>\\include {
yy_push_state (incl);
}
-<incl>\"[^"]*\";? { /* got the include file name */
-/* FIXME: semicolon? */
+<incl>\"[^"]*\" { /* got the include file name */
String s (YYText ()+1);
s = s.left_string (s.index_last ('"'));
new_input (s, sources_);
yy_pop_state ();
}
-<incl>\\{BLACK}*;?{WHITE} { /* got the include identifier */
-/* FIXME: semicolon? */
+<incl>\\{BLACK}*{WHITE} { /* got the include identifier */
String s = YYText () + 1;
strip_trailing_white (s);
if (s.length () && (s[s.length () - 1] == ';'))
s = s.left_string (s.length () - 1);
SCM sid = lookup_identifier (s);
- if (ly_c_string_p (sid)) {
+ if (scm_is_string (sid)) {
new_input (ly_scm2string (sid), sources_);
yy_pop_state ();
} else {
error_level_ = 1;
}
- for (int i=0; i < n; i++)
+ for (int i = 0; i < n; i++)
{
yyinput ();
}
yylval.i = String_convert::dec2int (String (YYText () +1));
return E_UNSIGNED;
}
-
\" {
start_quote ();
}
\" {
start_quote ();
}
- \< {
- return '<';
- }
- \> {
- return '>';
- }
\\score {
return SCORE;
}
String str (YYText () + 1);
SCM s = lookup_markup_command (str);
- if (ly_c_pair_p (s) && ly_c_symbol_p (ly_cdr (s)) ) {
- yylval.scm = ly_car(s);
- SCM tag = ly_cdr(s);
+ 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"))
}
{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 '>':
Lily_lexer::pop_state ()
{
if (YYSTATE == notes || YYSTATE == chords)
- pitchname_tab_stack_ = ly_cdr (pitchname_tab_stack_);
+ pitchname_tab_stack_ = scm_cdr (pitchname_tab_stack_);
yy_pop_state ();
}
SCM sym = ly_symbol2scm (str.to_str0 ());
if ((YYSTATE == notes) || (YYSTATE == chords)) {
SCM handle = SCM_BOOL_F;
- if (ly_c_pair_p (pitchname_tab_stack_))
- handle = scm_hashq_get_handle (ly_car (pitchname_tab_stack_), sym);
+ if (scm_is_pair (pitchname_tab_stack_))
+ handle = scm_hashq_get_handle (scm_car (pitchname_tab_stack_), sym);
- if (ly_c_pair_p (handle)) {
- yylval.scm = ly_cdr (handle);
+ if (scm_is_pair (handle)) {
+ yylval.scm = scm_cdr (handle);
if (unsmob_pitch (yylval.scm))
return (YYSTATE == notes) ? NOTENAME_PITCH : TONICNAME_PITCH;
- else if (ly_c_symbol_p (yylval.scm))
+ else if (scm_is_symbol (yylval.scm))
return DRUM_PITCH;
}
else if ((handle = scm_hashq_get_handle (chordmodifier_tab_, sym))!= SCM_BOOL_F)
{
- yylval.scm = ly_cdr (handle);
+ yylval.scm = scm_cdr (handle);
return CHORD_MODIFIER;
}
}
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;
/* 2.1.2x something -> \property -> \set. */
-Lilypond_version oldest_version ("2.2.0");
+Lilypond_version oldest_version ("2.3.22");
bool
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;
{
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;
projects / lilypond.git / blobdiff