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 <errno.h>
+#include <iostream>
+
+#include "parse-scm.hh"
#include "score.hh"
#include "lily-guile.hh"
#include "string.hh"
#include "string-convert.hh"
#include "my-lily-lexer.hh"
-#include "array.hh"
+#include "input-file-results.hh"
#include "interval.hh"
#include "lily-guile.hh"
#include "parser.hh"
-#include "debug.hh"
+#include "warn.hh"
#include "main.hh"
#include "musical-request.hh"
#include "version.hh"
void strip_trailing_white (String&);
void strip_leading_white (String&);
+String lyric_fudge (String s);
bool
yy_push_state (quote);\
yylval.string = new String
-#define yylval (*(YYSTYPE*)lexval_l)
+#define yylval \
+ (*(YYSTYPE*)lexval)
#define YY_USER_ACTION add_lexed_char (YYLeng ());
/*
*/
+
+SCM scan_fraction (String);
+SCM (* scm_parse_error_handler) (void *);
+
+
%}
%option c++
%x incl
%x lyrics
%x notes
+%x figures
%x quote
%x longcomment
AA {A}|_
N [0-9]
AN {AA}|{N}
-PUNCT [?!:']
+PUNCT [?!:'`]
ACCENT \\[`'"^]
-NATIONAL [\001-\006\021-\027\031\036\200-\377]
+NATIONAL [\001-\006\021-\027\031\036\200-\377]
TEX {AA}|-|{PUNCT}|{ACCENT}|{NATIONAL}
WORD {A}{AN}*
ALPHAWORD {A}+
DIGIT {N}
UNSIGNED {N}+
+E_UNSIGNED \\{N}+
+FRACTION {N}+\/{N}+
INT -?{UNSIGNED}
REAL ({INT}\.{N}*)|(-?\.{N}+)
KEYWORD \\{WORD}
// windows-suck-suck-suck
}
-<INITIAL,chords,incl,lyrics,notes>{
+<INITIAL,chords,incl,lyrics,notes,figures>{
"%{" {
yy_push_state (longcomment);
}
}
}
-<INITIAL,chords,lyrics,notes>\\version{WHITE}* {
+<INITIAL,chords,lyrics,notes,figures>\\version{WHITE}* {
yy_push_state (version);
}
-<version>\"[^"]*\";? { /* got the include file name */
+<version>\"[^"]*\" { /* got the version number */
String s (YYText ()+1);
- s = s.left_str (s.index_last_i ('"'));
- DEBUG_OUT << "#version `" << s << "'\n";
+ s = s.left_string (s.index_last ('"'));
+
yy_pop_state ();
if (!valid_version_b (s))
return INVALID;
yy_pop_state ();
}
<<EOF>> {
- LexerError (_ ("EOF found inside a comment").ch_C ());
+ LexerError (_ ("EOF found inside a comment").to_str0 ());
if (! close_input ())
yyterminate (); // can't move this, since it actually rets a YY_NULL
}
}
-<INITIAL,chords,lyrics,notes>\\maininput {
+<INITIAL,chords,lyrics,notes,figures>\\maininput {
if (!main_input_b_)
{
start_main_input ();
error (_ ("\\maininput disallowed 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);
+ s = s.left_string (s.index_last ('"'));
+
+ new_input (s, &global_input_file->sources_ );
yy_pop_state ();
}
<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.left_string (s.length () - 1);
+
SCM sid = lookup_identifier (s);
if (gh_string_p (sid)) {
- new_input (ly_scm2string (sid), source_global_l);
+ new_input (ly_scm2string (sid), &global_input_file->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.to_str0 ());
+ 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 (_ ("Missing end quote"));
exit (1);
}
-<chords,notes>{RESTNAME} {
+<chords,notes,figures>{RESTNAME} {
const char *s = YYText ();
- yylval.scm = ly_str02scm (s);
+ yylval.scm = scm_makfrom0str (s);
return RESTNAME;
}
-<chords,notes>R {
- return MEASURES;
+<chords,notes,figures>R {
+ return MULTI_MEASURE_REST;
}
-<INITIAL,chords,lyrics,notes>\\\${BLACK}*{WHITE} {
+<INITIAL,chords,lyrics,notes,figures>\\\${BLACK}*{WHITE} {
String s=YYText () + 2;
- s=s.left_str (s.length_i () - 1);
+ s=s.left_string (s.length () - 1);
return scan_escaped_word (s);
}
-<INITIAL,chords,lyrics,notes>\${BLACK}*{WHITE} {
+<INITIAL,chords,lyrics,notes,figures>\${BLACK}*{WHITE} {
String s=YYText () + 1;
- s=s.left_str (s.length_i () - 1);
+ s=s.left_string (s.length () - 1);
return scan_bare_word (s);
}
-<INITIAL,chords,lyrics,notes>\\\${BLACK}* { // backup rule
- cerr << _ ("white expected") << endl;
+<INITIAL,chords,lyrics,notes,figures>\\\${BLACK}* { // backup rule
+ error (_("white expected"));
exit (1);
}
-<INITIAL,chords,lyrics,notes>\${BLACK}* { // backup rule
- cerr << _ ("white expected") << endl;
+<INITIAL,chords,lyrics,notes,figures>\${BLACK}* { // backup rule
+ error (_("white expected"));
exit (1);
}
-<INITIAL,chords,lyrics,notes># { //embedded scm
+<INITIAL,chords,lyrics,notes,figures># { //embedded scm
//char const* s = YYText () + 1;
- char const* s = here_ch_C ();
+ char const* s = here_str0 ();
int n = 0;
if (main_input_b_ && safe_global_b) {
error (_ ("Can't evaluate Scheme in safe mode"));
yylval.scm = SCM_EOL;
return SCM_T;
}
- yylval.scm = ly_parse_scm (s, &n);
+ yylval.scm = ly_parse_scm (s, &n, here_input());
for (int i=0; i < n; i++)
{
return SCM_T;
}
-<notes>{
+<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;
}
+ {E_UNSIGNED} {
+ yylval.i = String_convert::dec2int (String (YYText () +1));
+ return E_UNSIGNED;
+ }
\" {
start_quote ();
}
<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 ());
+ yylval.scm = scm_makfrom0str (sp->to_str0 ());
delete sp;
return STRING;
}
\" {
start_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} {
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);
- }
-
- char c = s[s.length_i () - 1];
+ s = lyric_fudge (s);
+
+ 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 = scm_makfrom0str (s.to_str0 ());
+
- DEBUG_OUT << "lyric : `" << s << "'\n";
return STRING;
}
. {
{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;
}
\" {
\/\+ {
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
Real r;
int cnv=sscanf (YYText (), "%lf", &r);
assert (cnv == 1);
- DEBUG_OUT << "REAL" << r<<'\n';
- yylval.real = r;
+
+ yylval.scm = gh_double2scm (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>\\. {
+<INITIAL,lyrics,notes,figures>\\. {
char c= YYText ()[1];
switch (c) {
return E_SMALLER;
case '!':
return E_EXCLAMATION;
+ case '(':
+ return E_OPEN;
+ case ')':
+ return E_CLOSE;
+ case '[':
+ return E_LEFTSQUARE;
+ case ']':
+ return E_RIGHTSQUARE;
+ case '~':
+ return E_TILDE;
+ case '\\':
+ return E_BACKSLASH;
+
default:
return E_CHAR;
}
<*>. {
String msg = _f ("invalid character: `%c'", YYText ()[0]);
- LexerError (msg.ch_C ());
+ LexerError (msg.to_str0 ());
return YYText ()[0];
}
yy_push_state (notes);
}
+void
+My_lily_lexer::push_figuredbass_state()
+{
+ yy_push_state (figures);
+}
void
My_lily_lexer::push_chord_state ()
{
{
// use more SCM for this.
- SCM sym = ly_symbol2scm (str.ch_C());
+ SCM sym = ly_symbol2scm (str.to_str0 ());
int l = lookup_keyword (str);
if (l != -1) {
if (gh_pair_p (pitch))
{
- yylval.scm = gh_cdr (pitch);
+ yylval.scm = ly_cdr (pitch);
return NOTENAME_PITCH;
}
}
String msg (_f ("unknown escaped string: `\\%s'", str));
- LexerError (msg.ch_C ());
+ LexerError (msg.to_str0 ());
- yylval.scm = ly_str02scm(str.ch_C());
+ yylval.scm = scm_makfrom0str (str.to_str0 ());
return STRING;
}
int
My_lily_lexer::scan_bare_word (String str)
{
- SCM sym = ly_symbol2scm (str.ch_C ());
+ SCM sym = ly_symbol2scm (str.to_str0 ());
if ((YYSTATE == notes) || (YYSTATE == chords)) {
SCM pitch = scm_hashq_get_handle (pitchname_tab_, sym);
if (gh_pair_p (pitch)) {
- yylval.scm = gh_cdr (pitch);
+ yylval.scm = ly_cdr (pitch);
return (YYSTATE == notes) ? NOTENAME_PITCH : TONICNAME_PITCH;
} else if ((pitch = scm_hashq_get_handle (chordmodifier_tab_, sym))!= SCM_BOOL_F)
{
- yylval.scm = gh_cdr (pitch);
+ yylval.scm = ly_cdr (pitch);
return CHORDMODIFIER_PITCH;
}
}
- yylval.scm = ly_str02scm (str.ch_C());
+ yylval.scm = scm_makfrom0str (str.to_str0 ());
return STRING;
}
return YY_START == lyrics;
}
+bool
+My_lily_lexer::figure_state_b () const
+{
+ return YY_START == figures;
+}
+
/*
- urg, belong to String(_convert)
+ urg, belong to String (_convert)
and should be generalised
*/
void
strip_leading_white (String&s)
{
int i=0;
- for (; i < s.length_i (); i++)
+ for (; i < s.length (); i++)
if (!isspace (s[i]))
break;
- s = s.nomid_str (0, i);
+ s = s.nomid_string (0, i);
}
void
strip_trailing_white (String&s)
{
- int i=s.length_i ();
+ int i=s.length ();
while (i--)
if (!isspace (s[i]))
break;
- s = s.left_str (i+1);
+ s = s.left_string (i+1);
}
+/* 1.3.146 == removal of ; */
+Lilypond_version oldest_version ("1.3.146");
+
bool
valid_version_b (String s)
{
Lilypond_version current ( MAJOR_VERSION "." MINOR_VERSION "." PATCH_LEVEL );
Lilypond_version ver (s);
- if (!((ver >= oldest_version) && (ver <= current)))
+ if (! ((ver >= oldest_version) && (ver <= current)))
{
- non_fatal_error (_f ("incorrect lilypond version: %s (%s, %s)", ver.str (), oldest_version.str (), current.str ()));
- non_fatal_error (_("Consider converting the input with the convert-ly script"));
+ non_fatal_error (_f ("Incorrect lilypond version: %s (%s, %s)", ver.string (), oldest_version.string (), current.string ()));
+ non_fatal_error (_ ("Consider updating the input with the convert-ly script"));
return false;
}
return true;
}
+
+String
+lyric_fudge (String s)
+{
+ char * chars =s.get_copy_str0 ();
+
+ for (char * p = chars; *p ; p++)
+ {
+ if (*p == '_' && (p == chars || *(p-1) != '\\'))
+ *p = ' ';
+ }
+
+ s = String (chars);
+ delete[] chars;
+
+ 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);
+ }
+
+ return s;
+}
+
+/*
+Convert "NUM/DEN" into a '(NUM . DEN) cons.
+*/
+SCM
+scan_fraction (String frac)
+{
+ int i = frac.index ('/');
+ int l = frac.length ();
+ String left = frac.left_string (i);
+ String right = frac.right_string (l - i - 1);
+
+ int n = String_convert::dec2int (left);
+ int d = String_convert::dec2int (right);
+ return gh_cons (gh_int2scm (n), gh_int2scm (d));
+}
+