%{ // -*-Fundamental-*-
/*
- lexer.l -- implement the Flex lexer
+ lexer.ll -- implement the Flex lexer
source file of the LilyPond music typesetter
- (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1996--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
lex.backup
contains no backup states, but only the reminder
Compressed tables always back up.
- (don-t forget to rm lex.yy.cc :-)
+ (don-t forget to rm lex.yy.cc :-)
*/
-#include <stdio.h>
-#include <ctype.h>
-#include "lily-guile.hh"
-#include "string.hh"
-#include "string-convert.hh"
-#include "my-lily-lexer.hh"
-#include "array.hh"
+#include <cstdio>
+#include <cctype>
+#include <cerrno>
+
+/* 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 "context-def.hh"
+#include "identifier-smob.hh"
+#include "international.hh"
#include "interval.hh"
#include "lily-guile.hh"
-#include "parser.hh"
-#include "debug.hh"
+#include "lily-lexer.hh"
+#include "lilypond-version.hh"
#include "main.hh"
-#include "musical-request.hh"
-#include "identifier.hh"
+#include "music.hh"
+#include "music-function.hh"
+#include "parse-scm.hh"
+#include "parser.hh"
+#include "source-file.hh"
+#include "std-string.hh"
+#include "string-convert.hh"
#include "version.hh"
-#include "mudela-version.hh"
-
-void strip_trailing_white (String&);
-void strip_leading_white (String&);
-
+#include "warn.hh"
-bool
-valid_version_b (String s);
+/*
+RH 7 fix (?)
+*/
+#define isatty HORRIBLEKLUDGE
+void strip_trailing_white (string&);
+void strip_leading_white (string&);
+string lyric_fudge (string s);
+SCM lookup_markup_command (string s);
+bool is_valid_version (string s);
#define start_quote() \
yy_push_state (quote);\
- yylval.string = new String
+ yylval.string = new string
-#define yylval (*(YYSTYPE*)lexval_l)
+#define start_lyric_quote() \
+ yy_push_state (lyric_quote);\
+ yylval.string = new string
+
+#define yylval \
+ (*(YYSTYPE*)lexval)
+
+#define yylloc \
+ (*(YYLTYPE*)lexloc)
#define YY_USER_ACTION add_lexed_char (YYLeng ());
-/*
-LYRICS ({AA}|{TEX})[^0-9 \t\n\f]*
-*/
+SCM scan_fraction (string);
+SCM (* scm_parse_error_handler) (void *);
+
+
%}
%option noyywrap
%option nodefault
%option debug
-%option yyclass="My_lily_lexer"
+%option yyclass="Lily_lexer"
%option stack
%option never-interactive
%option warn
-%x version
+%x extratoken
%x chords
+%x figures
%x incl
%x lyrics
+%x lyric_quote
+%x longcomment
+%x markup
%x notes
%x quote
-%x longcomment
-
+%x sourcefileline
+%x sourcefilename
+%x version
-A [a-zA-Z]
+A [a-zA-Z\200-\377]
AA {A}|_
N [0-9]
AN {AA}|{N}
-PUNCT [?!:']
+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}+
+E_UNSIGNED \\{N}+
+FRACTION {N}+\/{N}+
INT -?{UNSIGNED}
REAL ({INT}\.{N}*)|(-?\.{N}+)
KEYWORD \\{WORD}
BLACK [^ \n\t\f\r]
RESTNAME [rs]
NOTECOMMAND \\{A}+
-LYRICS ({AA}|{TEX})[^0-9 \t\n\f]*
+MARKUPCOMMAND \\({A}|[-_])+
+LYRICS ({AA}|{TEX})[^0-9 \t\n\r\f]*
ESCAPED [nt\\'"]
EXTENDER __
HYPHEN --
+BOM_UTF8 \357\273\277
+
%%
// windows-suck-suck-suck
}
-<INITIAL,chords,incl,lyrics,notes>{
+<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)
+ {
+ LexerError (_ ("stray UTF-8 BOM encountered").c_str ());
+ exit (1);
+ }
+ if (be_verbose_global)
+ message (_ ("Skipping UTF-8 BOM"));
+}
+
+<INITIAL,chords,figures,incl,lyrics,markup,notes>{
"%{" {
yy_push_state (longcomment);
}
- %[^{\n].*\n {
+ %[^{\n\r].*[\n\r] {
}
- %[^{\n] { // backup rule
+ %[^{\n\r] { // backup rule
}
- %\n {
+ %[\n\r] {
}
- %[^{\n].* {
+ %[^{\n\r].* {
}
{WHITE}+ {
}
}
-<INITIAL,chords,lyrics,notes>\\version{WHITE}* {
+<INITIAL,notes,figures,chords,markup>{
+ \" {
+ start_quote ();
+ }
+}
+
+<INITIAL,chords,lyrics,notes,figures>\\version{WHITE}* {
yy_push_state (version);
}
-<version>\"[^"]*\";? { /* got the include file name */
- String s (YYText ()+1);
- s = s.left_str (s.index_last_i ('"'));
- DEBUG_OUT << "#version `" << s << "'\n";
- if (!valid_version_b (s))
+<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;
+
+
+}
+<sourcefilename>\"[^"]*\" {
+ string s (YYText () + 1);
+ s = s.substr (0, s.rfind ('\"'));
+
+ yy_pop_state ();
+ this->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_),
+ ly_symbol2scm ("input-file-name"),
+ ly_string2scm (s));
+
+}
+
+<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 ("No quoted string found after \\version");
+ LexerError (_ ("quoted string expected after \\version").c_str ());
+ yy_pop_state ();
+}
+<sourcefilename>. {
+ LexerError (_ ("quoted string expected after \\sourcefilename").c_str ());
+ yy_pop_state ();
+}
+<sourcefileline>. {
+ LexerError (_ ("integer expected after \\sourcefileline").c_str ());
yy_pop_state ();
}
<longcomment>{
yy_pop_state ();
}
<<EOF>> {
- LexerError (_ ("EOF found inside a comment").ch_C ());
+ LexerError (_ ("EOF found inside a comment").c_str ());
+ 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
}
}
-<INITIAL,chords,lyrics,notes>\\maininput {
- if (!main_input_b_)
+<INITIAL,chords,lyrics,notes,figures>\\maininput {
+ if (!is_main_input_)
{
start_main_input ();
- main_input_b_ = true;
+ is_main_input_ = true;
}
else
- error (_ ("\\maininput disallowed outside init files"));
+ error (_ ("\\maininput not allowed outside init files"));
}
-<INITIAL,chords,lyrics,notes>\\include {
+<INITIAL,chords,lyrics,figures,notes>\\include {
yy_push_state (incl);
}
-<incl>\"[^"]*\";? { /* got the include file name */
- String s (YYText ()+1);
- s = s.left_str (s.index_last_i ('"'));
- DEBUG_OUT << "#include `" << s << "'\n";
- new_input (s,source_global_l);
+<incl>\"[^"]*\" { /* got the include file name */
+ string s (YYText ()+1);
+ s = s.substr (0, s.rfind ('"'));
+
+ new_input (s, sources_);
yy_pop_state ();
}
-<incl>\\{BLACK}*;?{WHITE} { /* got the include identifier */
- String s = YYText () + 1;
+<incl>\\{BLACK}*{WHITE} { /* got the include identifier */
+ string s = YYText () + 1;
strip_trailing_white (s);
- if (s.length_i () && (s[s.length_i () - 1] == ';'))
- s = s.left_str (s.length_i () - 1);
- DEBUG_OUT << "#include `\\" << s << "'\n";
+ if (s.length () && (s[s.length () - 1] == ';'))
+ s = s.substr (0, s.length () - 1);
+
SCM sid = lookup_identifier (s);
- if (gh_string_p (sid)) {
- new_input (ly_scm2string (sid), source_global_l);
+ if (scm_is_string (sid)) {
+ new_input (ly_scm2string (sid), sources_);
yy_pop_state ();
} else {
- String msg (_f ("wrong or undefined identifier: `%s'", s ));
- LexerError (msg.ch_C ());
+ string msg (_f ("wrong or undefined identifier: `%s'", s ));
+
+ LexerError (msg.c_str ());
+ SCM err = scm_current_error_port ();
+ scm_puts ("This value was found in the table: ", err);
+ scm_display (sid, err);
}
}
<incl>\"[^"]* { // backup rule
- cerr << _ ("Missing end quote") << endl;
+ error (_ ("end quote missing"));
exit (1);
}
-<chords,notes>{RESTNAME} {
- const char *s = YYText ();
- yylval.scm = ly_str02scm (s);
+<chords,notes,figures>{RESTNAME} {
+ char const *s = YYText ();
+ yylval.scm = scm_from_locale_string (s);
return RESTNAME;
}
-<chords,notes>R {
- return MEASURES;
+<chords,notes,figures>R {
+ return MULTI_MEASURE_REST;
}
-<INITIAL,chords,lyrics,notes>\\\${BLACK}*{WHITE} {
- String s=YYText () + 2;
- s=s.left_str (s.length_i () - 1);
- return scan_escaped_word (s);
-}
-<INITIAL,chords,lyrics,notes>\${BLACK}*{WHITE} {
- String s=YYText () + 1;
- s=s.left_str (s.length_i () - 1);
- return scan_bare_word (s);
-}
-<INITIAL,chords,lyrics,notes>\\\${BLACK}* { // backup rule
- cerr << _ ("white expected") << endl;
- exit (1);
-}
-<INITIAL,chords,lyrics,notes>\${BLACK}* { // backup rule
- cerr << _ ("white expected") << endl;
- exit (1);
-}
-<INITIAL,chords,lyrics,notes># { //embedded scm
- //char const* s = YYText () + 1;
- char const* s = here_ch_C ();
+<INITIAL,chords,figures,lyrics,markup,notes># { //embedded scm
int n = 0;
- if (main_input_b_ && safe_global_b) {
- error (_ ("Can't evaluate Scheme in safe mode"));
- return SCM_EOL;
- }
- yylval.scm = ly_parse_scm (s, &n);
- DEBUG_OUT << "Scheme: ";
- if (flower_dstream)
- ly_display_scm (yylval.scm);
-
- for (int i=0; i < n; i++)
+ 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)
+ {
+ sval = SCM_UNSPECIFIED;
+ error_level_ = 1;
+ }
+
+ for (int i = 0; i < n; i++)
{
yyinput ();
}
- char_count_stack_.top () += n;
+ char_count_stack_.back () += n;
- return SCM_T;
+ if (unpack_identifier (sval) != SCM_UNDEFINED)
+ {
+ yylval.scm = unpack_identifier(sval);
+ return identifier_type (yylval.scm);
+ }
+
+ yylval.scm = sval;
+ return SCM_TOKEN;
+}
+<INITIAL,notes,lyrics>{
+ \<\< {
+ return DOUBLE_ANGLE_OPEN;
+ }
+ \>\> {
+ return DOUBLE_ANGLE_CLOSE;
+ }
}
-<notes>{
+
+<INITIAL,notes>{
+ \< {
+ return ANGLE_OPEN;
+ }
+ \> {
+ return ANGLE_CLOSE;
+ }
+}
+
+<figures>{
+ _ {
+ return FIGURE_SPACE;
+ }
+ \> {
+ return FIGURE_CLOSE;
+ }
+ \< {
+ return FIGURE_OPEN;
+ }
+}
+
+<notes,figures>{
{ALPHAWORD} {
return scan_bare_word (YYText ());
}
{NOTECOMMAND} {
return scan_escaped_word (YYText () + 1);
}
+ {FRACTION} {
+ yylval.scm = scan_fraction (YYText ());
+ return FRACTION;
+ }
{DIGIT} {
- yylval.i = String_convert::dec2_i (String (YYText ()));
+ yylval.i = String_convert::dec2int (string (YYText ()));
return DIGIT;
}
{UNSIGNED} {
- yylval.i = String_convert::dec2_i (String (YYText ()));
+ yylval.i = String_convert::dec2int (string (YYText ()));
return UNSIGNED;
}
-
- \" {
- start_quote ();
+ {E_UNSIGNED} {
+ yylval.i = String_convert::dec2int (string (YYText () +1));
+ return E_UNSIGNED;
}
}
-\" {
- start_quote ();
-}
-<quote>{
+<quote,lyric_quote>{
\\{ESCAPED} {
- *yylval.string += to_str (escaped_char(YYText()[1]));
+ *yylval.string += to_string (escaped_char (YYText ()[1]));
}
[^\\"]+ {
*yylval.string += YYText ();
}
\" {
- DEBUG_OUT << "quoted string: `" << *yylval.string << "'\n";
+
yy_pop_state ();
/* yylval is union. Must remember STRING before setting SCM*/
- String *sp = yylval.string;
- yylval.scm = ly_str02scm (sp->ch_C ());
+ string *sp = yylval.string;
+ yylval.scm = ly_string2scm (*sp);
delete sp;
- return STRING;
+ return is_lyric_state () ? LYRICS_STRING : STRING;
}
. {
*yylval.string += YYText ();
<lyrics>{
\" {
- start_quote ();
+ start_lyric_quote ();
+ }
+ {FRACTION} {
+ yylval.scm = scan_fraction (YYText ());
+ return FRACTION;
}
{UNSIGNED} {
- yylval.i = String_convert::dec2_i (String (YYText ()));
+ yylval.i = String_convert::dec2int (string (YYText ()));
return UNSIGNED;
}
{NOTECOMMAND} {
}
{LYRICS} {
/* ugr. This sux. */
- String s (YYText ());
+ string s (YYText ());
if (s == "__")
return yylval.i = EXTENDER;
if (s == "--")
return yylval.i = HYPHEN;
- int i = 0;
- while ((i=s.index_i ("_")) != -1) // change word binding "_" to " "
- *(s.ch_l () + i) = ' ';
- if ((i=s.index_i ("\\,")) != -1) // change "\," to TeX's "\c "
- {
- *(s.ch_l () + i + 1) = 'c';
- s = s.left_str (i+2) + " " + s.right_str (s.length_i ()-i-2);
- }
+ s = lyric_fudge (s);
- char c = s[s.length_i () - 1];
- if (c == '{' && c == '}') // brace open is for not confusing dumb tools.
+ char c = s[s.length () - 1];
+ 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 = ly_str02scm (s.ch_C ());
+ _ ("Brace found at end of lyric. Did you forget a space?"));
+ yylval.scm = ly_string2scm (s);
- DEBUG_OUT << "lyric : `" << s << "'\n";
- return STRING;
+
+ return LYRICS_STRING;
}
. {
return YYText ()[0];
{NOTECOMMAND} {
return scan_escaped_word (YYText () + 1);
}
+ {FRACTION} {
+ yylval.scm = scan_fraction (YYText ());
+ return FRACTION;
+ }
{UNSIGNED} {
- yylval.i = String_convert::dec2_i (String (YYText ()));
+ yylval.i = String_convert::dec2int (string (YYText ()));
return UNSIGNED;
}
- \" {
- start_quote ();
- }
- {
return CHORD_MINUS;
}
\/\+ {
return CHORD_BASS;
}
+ \/ {
+ return CHORD_SLASH;
+ }
\^ {
return CHORD_CARET;
}
}
}
-<<EOF>> {
- DEBUG_OUT << "<<eof>>";
- if (! close_input ()) {
- yyterminate (); // can't move this, since it actually rets a YY_NULL
+<markup>{
+ \\score {
+ return SCORE;
+ }
+ {MARKUPCOMMAND} {
+ string str (YYText () + 1);
+ SCM s = lookup_markup_command (str);
+
+ 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"))
+ return MARKUP_HEAD_EMPTY;
+ else if (tag == ly_symbol2scm ("markup0-markup1"))
+ return MARKUP_HEAD_MARKUP0_MARKUP1;
+ else if (tag == ly_symbol2scm ("markup-list0"))
+ return MARKUP_HEAD_LIST0;
+ else if (tag == ly_symbol2scm ("scheme0"))
+ return MARKUP_HEAD_SCM0;
+ else if (tag == ly_symbol2scm ("scheme0-scheme1"))
+ return MARKUP_HEAD_SCM0_SCM1;
+ else if (tag == ly_symbol2scm ("scheme0-markup1"))
+ 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-scheme1-scheme2"))
+ return MARKUP_HEAD_SCM0_SCM1_SCM2;
+ else {
+ programming_error ("no parser tag defined for this markup signature");
+ ly_display_scm (s);
+ assert(false);
+ }
+ } else
+ return scan_escaped_word (str);
+ }
+ [{}] {
+ return YYText ()[0];
+ }
+ [^#{}"\\ \t\n\r\f]+ {
+ string s (YYText ());
+
+ char c = s[s.length () - 1];
+ /* brace open is for not confusing dumb tools. */
+ if (c == '{' || c == '}')
+ here_input ().warning (
+ _ ("Brace found at end of markup. Did you forget a space?"));
+ yylval.scm = ly_string2scm (s);
+
+
+ return STRING;
+ }
+ . {
+ return YYText()[0];
}
}
+<*><<EOF>> {
+ if (is_main_input_)
+ {
+ /* 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 ();
+ }
+ else if (!close_input ())
+ /* Returns YY_NULL */
+ yyterminate ();
+}
+
+<INITIAL>{
+ {DASHED_WORD} {
+ return scan_bare_word (YYText ());
+ }
+ {DASHED_KEY_WORD} {
+ return scan_escaped_word (YYText () + 1);
+ }
+}
{WORD} {
return scan_bare_word (YYText ());
}
{REAL} {
Real r;
- int cnv=sscanf (YYText (), "%lf", &r);
+ int cnv = sscanf (YYText (), "%lf", &r);
assert (cnv == 1);
- DEBUG_OUT << "REAL" << r<<'\n';
- yylval.real = r;
+ (void) cnv;
+
+ yylval.scm = scm_from_double (r);
return REAL;
}
{UNSIGNED} {
- yylval.i = String_convert::dec2_i (String (YYText ()));
+ yylval.i = String_convert::dec2int (string (YYText ()));
return UNSIGNED;
}
+
[{}] {
- DEBUG_OUT << "parens\n";
return YYText ()[0];
}
[*:=] {
char c = YYText ()[0];
- DEBUG_OUT << "misc char" <<c<<"\n";
+
return c;
}
-<INITIAL,notes>. {
+<INITIAL,notes,figures>. {
return YYText ()[0];
}
-<INITIAL,lyrics,notes>\\. {
- char c= YYText ()[1];
+<INITIAL,lyrics,notes,figures>\\. {
+ 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 '(':
+ return E_OPEN;
+ case ')':
+ return E_CLOSE;
+ case '[':
+ return E_BRACKET_OPEN;
+ case '+':
+ return E_PLUS;
+ case ']':
+ return E_BRACKET_CLOSE;
+ case '~':
+ return E_TILDE;
+ case '\\':
+ return E_BACKSLASH;
+
default:
return E_CHAR;
}
}
<*>. {
- String msg = _f ("invalid character: `%c'", YYText ()[0]);
- LexerError (msg.ch_C ());
+ string msg = _f ("invalid character: `%c'", YYText ()[0]);
+ LexerError (msg.c_str ());
return YYText ()[0];
}
%%
+/* 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
-My_lily_lexer::push_note_state ()
+Lily_lexer::push_extra_token (int token_type)
{
- yy_push_state (notes);
+ 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
-My_lily_lexer::push_chord_state ()
+Lily_lexer::push_chord_state (SCM tab)
{
+ pitchname_tab_stack_ = scm_cons (tab, pitchname_tab_stack_);
yy_push_state (chords);
}
void
-My_lily_lexer::push_lyric_state ()
+Lily_lexer::push_figuredbass_state ()
+{
+ yy_push_state (figures);
+}
+
+void
+Lily_lexer::push_initial_state ()
+{
+ yy_push_state (INITIAL);
+}
+
+void
+Lily_lexer::push_lyric_state ()
{
yy_push_state (lyrics);
}
void
-My_lily_lexer::pop_state ()
+Lily_lexer::push_markup_state ()
+{
+ yy_push_state (markup);
+}
+
+void
+Lily_lexer::push_note_state (SCM tab)
+{
+ pitchname_tab_stack_ = scm_cons (tab, pitchname_tab_stack_);
+ yy_push_state (notes);
+}
+
+void
+Lily_lexer::pop_state ()
{
+ if (YYSTATE == notes || YYSTATE == chords)
+ pitchname_tab_stack_ = scm_cdr (pitchname_tab_stack_);
+
yy_pop_state ();
}
int
-My_lily_lexer::scan_escaped_word (String str)
+Lily_lexer::identifier_type (SCM sid)
+{
+ int k = try_special_identifiers (&yylval.scm , sid);
+ return k >= 0 ? k : SCM_IDENTIFIER;
+}
+
+
+int
+Lily_lexer::scan_escaped_word (string str)
{
// use more SCM for this.
- SCM sym = ly_symbol2scm (str.ch_C());
+// SCM sym = ly_symbol2scm (str.c_str ());
+
+ int i = lookup_keyword (str);
+ if (i == MARKUP && is_lyric_state ())
+ return LYRIC_MARKUP;
+ if (i != -1)
+ return i;
- int l = lookup_keyword (str);
- if (l != -1) {
- return l;
- }
SCM sid = lookup_identifier (str);
- if (gh_string_p (sid)) {
- yylval.scm = sid;
- return STRING_IDENTIFIER;
+ if (is_music_function (sid))
+ {
+ yylval.scm = get_music_function_transform (sid);
+
+ 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;
}
- Identifier * id = unsmob_identifier (sid);
- if (id) {
- yylval.id = id;
- return id->token_code_i_;
- } else if (sid != SCM_UNDEFINED) {
+ if (sid != SCM_UNDEFINED)
+ {
yylval.scm = sid;
- return SCM_IDENTIFIER;
+ return identifier_type (sid);
}
- if ((YYSTATE != notes) && (YYSTATE != chords)) {
- SCM pitch = scm_hashq_ref (pitchname_tab_, sym, SCM_BOOL_F);
-
- if (pitch != SCM_BOOL_F)
- {
- yylval.pitch = new Musical_pitch (pitch);
- yylval.pitch->set_spot (Input (source_file_l (),
- here_ch_C ()));
- return NOTENAME_PITCH;
- }
- }
- String msg (_f ("unknown escaped string: `\\%s'", str));
- LexerError (msg.ch_C ());
+ string msg (_f ("unknown escaped string: `\\%s'", str));
+ LexerError (msg.c_str ());
- yylval.scm = ly_str02scm(str.ch_C());
+ yylval.scm = ly_string2scm (str);
return STRING;
}
int
-My_lily_lexer::scan_bare_word (String str)
+Lily_lexer::scan_bare_word (string str)
{
- SCM sym = ly_symbol2scm (str.ch_C ());
+ SCM sym = ly_symbol2scm (str.c_str ());
if ((YYSTATE == notes) || (YYSTATE == chords)) {
- SCM pitch = scm_hashq_ref (pitchname_tab_, sym, SCM_BOOL_F);
- if (pitch != SCM_BOOL_F) {
- yylval.pitch = new Musical_pitch (pitch);
- yylval.pitch->set_spot (Input (source_file_l (),
- here_ch_C ()));
- return (YYSTATE == notes) ? NOTENAME_PITCH : TONICNAME_PITCH;
- } else if ((pitch = scm_hashq_ref (chordmodifier_tab_, sym, SCM_BOOL_F))!= SCM_BOOL_F)
+ SCM handle = SCM_BOOL_F;
+ if (scm_is_pair (pitchname_tab_stack_))
+ handle = scm_hashq_get_handle (scm_car (pitchname_tab_stack_), sym);
+
+ if (scm_is_pair (handle)) {
+ yylval.scm = scm_cdr (handle);
+ if (unsmob_pitch (yylval.scm))
+ return (YYSTATE == notes) ? NOTENAME_PITCH : TONICNAME_PITCH;
+ else if (scm_is_symbol (yylval.scm))
+ return DRUM_PITCH;
+ }
+ else if ((handle = scm_hashq_get_handle (chordmodifier_tab_, sym))!= SCM_BOOL_F)
{
- yylval.pitch = new Musical_pitch (pitch);
- yylval.pitch->set_spot (Input (source_file_l (),
- here_ch_C ()));
- return CHORDMODIFIER_PITCH;
+ yylval.scm = scm_cdr (handle);
+ return CHORD_MODIFIER;
}
}
- yylval.scm = ly_str02scm (str.ch_C());
+ 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 get_state () == notes;
+}
+
bool
-My_lily_lexer::note_state_b () const
+Lily_lexer::is_chord_state () const
{
- return YY_START == notes;
+ return get_state () == chords;
}
bool
-My_lily_lexer::chord_state_b () const
+Lily_lexer::is_lyric_state () const
{
- return YY_START == chords;
+ return get_state () == lyrics;
}
bool
-My_lily_lexer::lyric_state_b () const
+Lily_lexer::is_figure_state () const
{
- return YY_START == lyrics;
+ return get_state () == figures;
}
/*
- urg, belong to String(_convert)
+ urg, belong to string (_convert)
and should be generalised
*/
void
-strip_leading_white (String&s)
+strip_leading_white (string&s)
{
- int i=0;
- for (; i < s.length_i (); i++)
+ ssize i = 0;
+ for (; i < s.length (); i++)
if (!isspace (s[i]))
break;
- s = s.nomid_str (0, i);
+ s = s.substr (i);
}
void
-strip_trailing_white (String&s)
+strip_trailing_white (string&s)
{
- int i=s.length_i ();
+ ssize i = s.length ();
while (i--)
if (!isspace (s[i]))
break;
- s = s.left_str (i+1);
+ s = s.substr (0, i + 1);
}
+Lilypond_version oldest_version ("2.7.38");
+
bool
-valid_version_b (String s)
+is_valid_version (string s)
{
- Mudela_version current ( MAJOR_VERSION "." MINOR_VERSION "." PATCH_LEVEL );
- Mudela_version ver (s);
- if (!((ver >= oldest_version) && (ver <= current)))
+ Lilypond_version current ( MAJOR_VERSION "." MINOR_VERSION "." PATCH_LEVEL );
+ Lilypond_version ver (s);
+ if (int (ver) < oldest_version)
{
- error (_f ("incorrect mudela version: %s (%s, %s)", ver.str (), oldest_version.str (), current.str ()));
- if (!version_ignore_global_b)
- return false;
- }
+ 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;
}
+
+/*
+ substitute _ and \,
+*/
+string
+lyric_fudge (string s)
+{
+ char *chars = string_copy (s);
+
+ for (char *p = chars; *p ; p++)
+ {
+ if (*p == '_' && (p == chars || *(p-1) != '\\'))
+ *p = ' ';
+ }
+
+ s = string (chars);
+ delete[] chars;
+
+ ssize i = 0;
+ if ((i = s.find ("\\,")) != NPOS) // change "\," to TeX's "\c "
+ {
+ * (((char*)s.c_str ()) + i + 1) = 'c';
+ s = s.substr (0, i + 2) + " " + s.substr (i - 2);
+ }
+
+ return s;
+}
+
+/*
+Convert "NUM/DEN" into a '(NUM . DEN) cons.
+*/
+SCM
+scan_fraction (string frac)
+{
+ ssize i = frac.find ('/');
+ 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));
+}
+
+SCM
+lookup_markup_command (string s)
+{
+ SCM proc = ly_lily_module_constant ("lookup-markup-command");
+ return scm_call_1 (proc, ly_string2scm (s));
+}
+
+/* Shut up lexer warnings. */
+#if YY_STACK_USED
+
+static void
+yy_push_state (int)
+{
+}
+
+static void
+yy_pop_state ()
+{
+}
+
+static int
+yy_top_state ()
+{
+ return 0;
+}
+
+static void
+silence_lexer_warnings ()
+{
+ (void) yy_start_stack_ptr;
+ (void) yy_start_stack_depth;
+ (void) yy_start_stack;
+ (void) yy_push_state;
+ (void) yy_pop_state;
+ (void) yy_top_state;
+ (void) silence_lexer_warnings;
+}
+#endif