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 <iostream.h> /* gcc 3.0 */
+#include <errno.h>
+
+#include "score.hh"
#include "lily-guile.hh"
#include "string.hh"
#include "string-convert.hh"
#include "debug.hh"
#include "main.hh"
#include "musical-request.hh"
-#include "identifier.hh"
#include "version.hh"
#include "lilypond-input-version.hh"
#include "translator-def.hh"
+#include "music-output-def.hh"
/*
RH 7 fix (?)
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_l)
#define YY_USER_ACTION add_lexed_char (YYLeng ());
/*
*/
+
+SCM scan_fraction (String);
+
%}
%option c++
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}+
+FRACTION {N}+\/{N}+
INT -?{UNSIGNED}
REAL ({INT}\.{N}*)|(-?\.{N}+)
KEYWORD \\{WORD}
<INITIAL,chords,lyrics,notes>\\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";
+
yy_pop_state ();
if (!valid_version_b (s))
return INVALID;
<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);
yy_pop_state ();
}
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";
+
SCM sid = lookup_identifier (s);
if (gh_string_p (sid)) {
new_input (ly_scm2string (sid), source_global_l);
yy_pop_state ();
} else {
- String msg (_f ("wrong or undefined identifier: `%s'", s ));
+ String msg (_f ("wrong or undefined identifier: `%s'", s ));
+
LexerError (msg.ch_C ());
+ SCM err = scm_current_error_port ();
+ scm_puts ("This value was found in the table: ", err);
+ scm_display (sid, err);
}
}
<incl>\"[^"]* { // backup rule
return RESTNAME;
}
<chords,notes>R {
- return MEASURES;
+ return MULTI_MEASURE_REST;
}
<INITIAL,chords,lyrics,notes>\\\${BLACK}*{WHITE} {
String s=YYText () + 2;
cerr << _ ("white expected") << endl;
exit (1);
}
+
<INITIAL,chords,lyrics,notes># { //embedded scm
//char const* s = YYText () + 1;
char const* s = here_ch_C ();
{NOTECOMMAND} {
return scan_escaped_word (YYText () + 1);
}
+ {FRACTION} {
+ yylval.scm = scan_fraction (YYText ());
+ return FRACTION;
+ }
{DIGIT} {
yylval.i = String_convert::dec2_i (String (YYText ()));
}
<quote>{
\\{ESCAPED} {
- *yylval.string += to_str (escaped_char(YYText()[1]));
+ *yylval.string += to_str (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 = ly_str02scm (sp->ch_C ());
delete sp;
return STRING;
}
\" {
start_quote ();
}
+ {FRACTION} {
+ yylval.scm = scan_fraction (YYText ());
+ return FRACTION;
+ }
{UNSIGNED} {
yylval.i = String_convert::dec2_i (String (YYText ()));
return UNSIGNED;
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.
here_input ().warning (
- "Brace found at end of lyric. Did you forget a space?");
+ _ ("Brace found at end of lyric. Did you forget a space?"));
yylval.scm = ly_str02scm (s.ch_C ());
- 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 ()));
return UNSIGNED;
}
<<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;
}
}
[{}] {
- DEBUG_OUT << "parens\n";
+
return YYText ()[0];
}
[*:=] {
char c = YYText ()[0];
- DEBUG_OUT << "misc char" <<c<<"\n";
+
return c;
}
return E_SMALLER;
case '!':
return E_EXCLAMATION;
+ case '\\':
+ return E_BACKSLASH;
+ case '(':
+ return E_OPEN;
+ case ')':
+ return E_CLOSE;
default:
return E_CHAR;
}
{
// use more SCM for this.
- SCM sym = ly_symbol2scm (str.ch_C());
+ SCM sym = ly_symbol2scm (str.ch_C ());
int l = lookup_keyword (str);
if (l != -1) {
} else if (unsmob_translator_def (sid)) {
yylval.scm = sid;
return TRANSLATOR_IDENTIFIER;
+ } else if (unsmob_score (sid)) {
+ yylval.scm =sid;
+ return SCORE_IDENTIFIER;
} else if (Music * mus =unsmob_music (sid)) {
yylval.scm = sid;
} else if (unsmob_duration (sid)) {
yylval.scm = sid;
return DURATION_IDENTIFIER;
+ } else if (unsmob_music_output_def (sid)) {
+ yylval.scm = sid;
+ return MUSIC_OUTPUT_DEF_IDENTIFIER;
}
-
-
-
- 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;
}
String msg (_f ("unknown escaped string: `\\%s'", str));
LexerError (msg.ch_C ());
- yylval.scm = ly_str02scm(str.ch_C());
+ yylval.scm = ly_str02scm (str.ch_C ());
return STRING;
}
}
}
- yylval.scm = ly_str02scm (str.ch_C());
+ yylval.scm = ly_str02scm (str.ch_C ());
return STRING;
}
}
/*
- urg, belong to String(_convert)
+ urg, belong to String (_convert)
and should be generalised
*/
void
+Lilypond_version oldest_version ("1.3.59");
+
+void
+print_lilypond_versions (ostream &os)
+{
+ os << _f ("Oldest supported input version: %s", oldest_version.str ())
+ << endl;
+}
+
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 (_ ("Consider converting the input with the convert-ly script"));
return false;
}
return true;
}
+
+String
+lyric_fudge (String s)
+{
+ char * chars =s.copy_ch_p ();
+
+ 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_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);
+ }
+
+ return s;
+}
+
+/*
+Convert "NUM/DEN" into a '(NUM . DEN) cons.
+*/
+SCM
+scan_fraction (String frac)
+{
+ int i = frac.index_i ('/');
+ int l = frac.length_i ();
+ String left = frac.left_str (i);
+ String right = frac.right_str (l - i - 1);
+
+ int n = String_convert::dec2_i (left);
+ int d = String_convert::dec2_i (right);
+ return gh_cons (gh_int2scm (n), gh_int2scm (d));
+}
+