#include <stdio.h>
#include <ctype.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 "mudela-version.hh"
+#include "lilypond-input-version.hh"
+#include "translator-def.hh"
+#include "music-output-def.hh"
+
+/*
+RH 7 fix (?)
+*/
+#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");
cerr << _ ("white expected") << endl;
exit (1);
}
+
<INITIAL,chords,lyrics,notes># { //embedded scm
//char const* s = YYText () + 1;
char const* s = here_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: ";
- if (flower_dstream)
- ly_display_scm (yylval.scm);
for (int i=0; i < n; i++)
{
}
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?");
+ _("Brace found at end of lyric. Did you forget a space?"));
yylval.scm = ly_str02scm (s.ch_C ());
DEBUG_OUT << "lyric : `" << s << "'\n";
}
[{}] {
-
DEBUG_OUT << "parens\n";
return YYText ()[0];
}
return E_SMALLER;
case '!':
return E_EXCLAMATION;
+ case '(':
+ return E_OPEN;
+ case ')':
+ return E_CLOSE;
default:
return E_CHAR;
}
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 (unsmob_score (sid)) {
+ yylval.scm =sid;
+ return SCORE_IDENTIFIER;
+ } else if (Music * mus =unsmob_music (sid)) {
+ yylval.scm = sid;
+
+ return dynamic_cast<Request*> (mus) ? REQUEST_IDENTIFIER : MUSIC_IDENTIFIER;
+ } 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;
}
if ((YYSTATE != notes) && (YYSTATE != chords)) {
- SCM pitch = scm_hashq_ref (pitchname_tab_, sym, SCM_BOOL_F);
+ SCM pitch = scm_hashq_get_handle (pitchname_tab_, sym);
- if (pitch != SCM_BOOL_F)
+ if (gh_pair_p (pitch))
{
- yylval.pitch = new Musical_pitch (pitch);
- yylval.pitch->set_spot (Input (source_file_l (),
- here_ch_C ()));
+ yylval.scm = gh_cdr (pitch);
return NOTENAME_PITCH;
}
}
{
SCM sym = ly_symbol2scm (str.ch_C ());
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 ()));
+ SCM pitch = scm_hashq_get_handle (pitchname_tab_, sym);
+ if (gh_pair_p (pitch)) {
+ yylval.scm = gh_cdr (pitch);
return (YYSTATE == notes) ? NOTENAME_PITCH : TONICNAME_PITCH;
- } else if ((pitch = scm_hashq_ref (chordmodifier_tab_, sym, SCM_BOOL_F))!= SCM_BOOL_F)
+ } else if ((pitch = 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 ()));
+ yylval.scm = gh_cdr (pitch);
return CHORDMODIFIER_PITCH;
}
}
bool
valid_version_b (String s)
{
- Mudela_version current ( MAJOR_VERSION "." MINOR_VERSION "." PATCH_LEVEL );
- Mudela_version ver (s);
+ Lilypond_version current ( MAJOR_VERSION "." MINOR_VERSION "." PATCH_LEVEL );
+ Lilypond_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 lilypond version: %s (%s, %s)", ver.str (), oldest_version.str (), current.str ()));
+ non_fatal_error (_("Consider converting the input with the convert-ly script"));
+ return false;
}
return true;
}