%{ // -*-Fundamental-*-
/*
- lexer.l -- implement the Flex lexer
+ lexer.ll -- implement the Flex lexer
source file of the LilyPond music typesetter
- (c) 1996--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1996--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include <ctype.h>
#include <errno.h>
+/* 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 "source-file.hh"
#include "parse-scm.hh"
#include "lily-guile.hh"
#include "string.hh"
#include "main.hh"
#include "version.hh"
#include "lilypond-input-version.hh"
-#include "translator-def.hh"
+#include "context-def.hh"
#include "identifier-smob.hh"
/*
%option never-interactive
%option warn
+%x renameinput
%x version
%x chords
%x incl
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 --
"%{" {
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,figures>\\version{WHITE}* {
yy_push_state (version);
}
+<INITIAL,chords,lyrics,notes,figures>\\renameinput{WHITE}* {
+ yy_push_state (renameinput);
+}
<version>\"[^"]*\" { /* got the version number */
String s (YYText ()+1);
s = s.left_string (s.index_last ('\"'));
- yy_pop_state ();
- if (!valid_version_b (s))
+ yy_pop_state();
+ if (!valid_version_b (s))
return INVALID;
}
+<renameinput>\"[^"]*\" { /* got the version number */
+ String s (YYText ()+1);
+ s = s.left_string (s.index_last ('\"'));
+
+ yy_pop_state();
+ this->here_input().source_file_->name_ = s;
+ progress_indication (_f("\nRenamed input to `%s'", s.to_str0()));
+ scm_module_define (gh_car (scopes_),
+ ly_symbol2scm ("input-file-name"),
+ scm_makfrom0str (s.to_str0()));
+
+}
+
<version>. {
LexerError ("No quoted string found after \\version");
yy_pop_state ();
}
+<renameinput>. {
+ LexerError ("No quoted string found after \\renameinput");
+ yy_pop_state ();
+}
<longcomment>{
[^\%]* {
}
}
<<EOF>> {
LexerError (_ ("EOF found inside a comment").to_str0 ());
+ main_input_b_ = false;
if (! close_input ())
yyterminate (); // can't move this, since it actually rets a YY_NULL
}
main_input_b_ = true;
}
else
- error (_ ("\\maininput disallowed outside init files"));
+ error (_ ("\\maininput not allowed outside init files"));
}
<INITIAL,chords,lyrics,figures,notes>\\include {
//char const* s = YYText () + 1;
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;
- }
- SCM sval = ly_parse_scm (s, &n, here_input());
+ SCM sval = ly_parse_scm (s, &n, here_input (),
+ safe_global_b && main_input_b_);
+
if (sval == SCM_UNDEFINED)
- {
+ {
sval = SCM_UNSPECIFIED;
errorlevel_ = 1;
- }
+ }
for (int i=0; i < n; i++)
{
yylval.scm = sval;
return SCM_T;
}
-<INITIAL,notes>{
+<INITIAL,notes,lyrics>{
\<\< {
- return CHORD_OPEN;
+ return LESSLESS;
}
\>\> {
- return CHORD_CLOSE;
+ return MOREMORE;
}
}
<figures>{
\" {
start_quote ();
}
- {NOTECOMMAND} {
+ \< {
+ return '<';
+ }
+ \> {
+ return '>';
+ }
+ {MARKUPCOMMAND} {
String str (YYText() + 1);
SCM s = lookup_markup_command (str);
SCM tag = gh_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 ("scm0"))
+ else if (tag == ly_symbol2scm ("scheme0"))
return MARKUP_HEAD_SCM0;
- else if (tag == ly_symbol2scm ("scm0-scm1"))
+ else if (tag == ly_symbol2scm ("scheme0-scheme1"))
return MARKUP_HEAD_SCM0_SCM1;
- else if (tag == ly_symbol2scm ("scm0-markup1"))
+ else if (tag == ly_symbol2scm ("scheme0-markup1"))
return MARKUP_HEAD_SCM0_MARKUP1;
- else if (tag == ly_symbol2scm ("scm0-scm1-markup2"))
+ 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 signature. Abort");
ly_display_scm (s);
assert(false);
}
} else
return scan_escaped_word (str);
}
- {LYRICS} {
+ [{}] {
+ return YYText()[0];
+ }
+ [^#{}"\\ \t\n\r\f]+ {
String s (YYText ());
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?"));
+ _ ("Brace found at end of markup. Did you forget a space?"));
yylval.scm = scm_makfrom0str (s.to_str0 ());
return STRING;
}
- {WHITE} {
-
- }
- . {
- return YYText ()[0];
+ . {
+ return YYText()[0];
}
}
<<EOF>> {
-
-
+ main_input_b_ = false;
if (! close_input ()) {
yyterminate (); // can't move this, since it actually rets a YY_NULL
}
%%
void
-My_lily_lexer::push_note_state ()
+My_lily_lexer::push_note_state (SCM tab)
{
+ pitchname_tab_stack_ = gh_cons (tab, pitchname_tab_stack_);
yy_push_state (notes);
}
yy_push_state (figures);
}
void
-My_lily_lexer::push_chord_state ()
+My_lily_lexer::push_chord_state (SCM tab)
{
+ pitchname_tab_stack_ = gh_cons (tab, pitchname_tab_stack_);
yy_push_state (chords);
}
void
My_lily_lexer::pop_state ()
{
+ if (YYSTATE == notes || YYSTATE == chords)
+ pitchname_tab_stack_ = gh_cdr (pitchname_tab_stack_);
yy_pop_state ();
}
{
// use more SCM for this.
- SCM sym = ly_symbol2scm (str.to_str0 ());
+// SCM sym = ly_symbol2scm (str.to_str0 ());
int l = lookup_keyword (str);
if (l != -1) {
return identifier_type (sid);
}
- if ((YYSTATE != notes) && (YYSTATE != chords)) {
- SCM pitch = scm_hashq_get_handle (pitchname_tab_, sym);
-
- if (gh_pair_p (pitch))
- {
- yylval.scm = ly_cdr (pitch);
- return NOTENAME_PITCH;
- }
- }
String msg (_f ("unknown escaped string: `\\%s'", str));
LexerError (msg.to_str0 ());
{
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 = ly_cdr (pitch);
- return (YYSTATE == notes) ? NOTENAME_PITCH : TONICNAME_PITCH;
- } else if ((pitch = scm_hashq_get_handle (chordmodifier_tab_, sym))!= SCM_BOOL_F)
+ SCM handle = SCM_BOOL_F;
+ if (gh_pair_p (pitchname_tab_stack_))
+ handle = scm_hashq_get_handle (gh_car (pitchname_tab_stack_), sym);
+
+ if (gh_pair_p (handle)) {
+ yylval.scm = ly_cdr (handle);
+ if (unsmob_pitch (yylval.scm))
+ return (YYSTATE == notes) ? NOTENAME_PITCH : TONICNAME_PITCH;
+ else if (gh_symbol_p (yylval.scm))
+ return DRUM_PITCH;
+ }
+ else if ((handle = scm_hashq_get_handle (chordmodifier_tab_, sym))!= SCM_BOOL_F)
{
- yylval.scm = ly_cdr (pitch);
- return CHORDMODIFIER_PITCH;
+ yylval.scm = ly_cdr (handle);
+ return CHORD_MODIFIER;
}
}
-/* 1.3.146 == removal of ; */
-Lilypond_version oldest_version ("1.3.146");
+/* 1.9.0 == postfix articulations */
+Lilypond_version oldest_version ("1.9.0");
bool
Lilypond_version ver (s);
if (! ((ver >= oldest_version) && (ver <= current)))
{
- non_fatal_error (_f ("Incorrect lilypond version: %s (%s, %s)", ver.string (), oldest_version.string (), current.string ()));
+ non_fatal_error (_f ("Incorrect lilypond version: %s (%s, %s)", ver.to_string (), oldest_version.to_string (), current.to_string ()));
non_fatal_error (_ ("Consider updating the input with the convert-ly script"));
return false;
}
return gh_cons (gh_int2scm (n), gh_int2scm (d));
}
+// Breaks for flex 2.5.31
+#if 0
/* avoid silly flex induced gcc warnings */
static void yy_push_state (int) {;}
static void yy_pop_state () {;}
yy_top_state ();
avoid_silly_flex_induced_gcc_warnings ();
}
+#endif
SCM
lookup_markup_command (String s)