source file of the LilyPond music typesetter
- (c) 1996--1999 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1996--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "main.hh"
#include "musical-request.hh"
#include "identifier.hh"
-#include "mudela-version.hh"
#include "version.hh"
+#include "mudela-version.hh"
+#include "translator-def.hh"
+
+#define isatty HORRIBLEKLUDGE
void strip_trailing_white (String&);
void strip_leading_white (String&);
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;
- yy_pop_state ();
}
<version>. {
LexerError ("No quoted string found after \\version");
if (s.length_i () && (s[s.length_i () - 1] == ';'))
s = s.left_str (s.length_i () - 1);
DEBUG_OUT << "#include `\\" << s << "'\n";
- Identifier * id = lookup_identifier (s);
- if (id)
- {
- String* s_l = id->access_content_String (false);
- DEBUG_OUT << "#include `" << *s_l << "'\n";
- new_input (*s_l, source_global_l);
-
- yy_pop_state ();
- }
- else
- {
- String msg (_f ("undefined identifier: `%s'", s ));
+ 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 ));
LexerError (msg.ch_C ());
}
}
int n = 0;
if (main_input_b_ && safe_global_b) {
error (_ ("Can't evaluate Scheme in safe mode"));
- return SCM_EOL;
+ yylval.scm = SCM_EOL;
+ return SCM_T;
}
yylval.scm = ly_parse_scm (s, &n);
DEBUG_OUT << "Scheme: ";
}
char c = s[s.length_i () - 1];
- if (c == '{' && c == '}') // brace open is for not confusing dumb tools.
+ 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 ());
return STRING;
}
. {
- return yylval.c = YYText ()[0];
+ return YYText ()[0];
}
}
<chords>{
- {
return CHORD_MINUS;
}
+ : {
+ return CHORD_COLON;
+ }
+ \/\+ {
+ return CHORD_BASS;
+ }
\^ {
return CHORD_CARET;
}
. {
- return yylval.c = YYText ()[0];
+ return YYText ()[0];
}
}
}
<INITIAL,notes>. {
- return yylval.c = YYText ()[0];
+ return YYText ()[0];
}
<INITIAL,lyrics,notes>\\. {
char c= YYText ()[1];
- yylval.c = c;
+
switch (c) {
case '>':
return E_BIGGER;
int
My_lily_lexer::scan_escaped_word (String str)
{
- DEBUG_OUT << "\\word: `" << str<<"'\n";
+ // use more SCM for this.
+
+ SCM sym = ly_symbol2scm (str.ch_C());
+
int l = lookup_keyword (str);
if (l != -1) {
- DEBUG_OUT << "(keyword)\n";
return l;
}
- Identifier * id = lookup_identifier (str);
+ SCM sid = lookup_identifier (str);
+ if (gh_string_p (sid)) {
+ yylval.scm = sid;
+ return STRING_IDENTIFIER;
+ } else if (gh_number_p (sid)) {
+ yylval.scm = sid;
+ return NUMBER_IDENTIFIER;
+ } else if (unsmob_translator_def (sid)) {
+ yylval.scm = sid;
+ return TRANSLATOR_IDENTIFIER;
+ } else if (Music * mus =unsmob_music (sid)) {
+ yylval.scm = sid;
+
+ return dynamic_cast<Request*> (mus) ? REQUEST_IDENTIFIER : MUSIC_IDENTIFIER;
+ }
+
+
+
+ Identifier * id = unsmob_identifier (sid);
if (id) {
- DEBUG_OUT << "(identifier)\n";
yylval.id = id;
return id->token_code_i_;
+ } else if (sid != SCM_UNDEFINED) {
+ yylval.scm = sid;
+ return SCM_IDENTIFIER;
}
+
if ((YYSTATE != notes) && (YYSTATE != chords)) {
- if (notename_b (str)) {
- yylval.pitch = new Musical_pitch (lookup_notename (str));
+ 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;
}
}
- if (flower_dstream)
- print_declarations (true);
String msg (_f ("unknown escaped string: `\\%s'", str));
LexerError (msg.ch_C ());
- DEBUG_OUT << "(string)";
+
yylval.scm = ly_str02scm(str.ch_C());
return STRING;
int
My_lily_lexer::scan_bare_word (String str)
{
- DEBUG_OUT << "word: `" << str<< "'\n";
+ SCM sym = ly_symbol2scm (str.ch_C ());
if ((YYSTATE == notes) || (YYSTATE == chords)) {
- if (notename_b (str)) {
- DEBUG_OUT << "(notename)\n";
- yylval.pitch = new Musical_pitch (lookup_notename (str));
+ 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 (chordmodifier_b (str)) {
- DEBUG_OUT << "(chordmodifier)\n";
- yylval.pitch = new Musical_pitch (lookup_chordmodifier (str));
+ } else if ((pitch = scm_hashq_ref (chordmodifier_tab_, sym, SCM_BOOL_F))!= SCM_BOOL_F)
+ {
+ yylval.pitch = new Musical_pitch (pitch);
yylval.pitch->set_spot (Input (source_file_l (),
here_ch_C ()));
return CHORDMODIFIER_PITCH;
Mudela_version ver (s);
if (!((ver >= oldest_version) && (ver <= current)))
{
- 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 ("incorrect mudela version: %s (%s, %s)", ver.str (), oldest_version.str (), current.str ()));
+ non_fatal_error (_("Consider converting the input with the convert-mudela script"));
+ return false;
}
return true;
}
projects / lilypond.git / blobdiff