source file of the GNU LilyPond music typesetter
- (c) 1997--1998 Han-Wen Nienhuys <hanwen@stack.nl>
+ (c) 1997--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include <strstream.h>
#include <ctype.h>
-#include "notename-table.hh"
+
+#include "lily-proto.hh"
+#include "scm-hash.hh"
#include "interval.hh"
-#include "identifier.hh"
-#include "assoc-iter.hh"
+
+#include "lily-guile.hh"
#include "parser.hh"
#include "keyword.hh"
-#include "assoc.hh"
#include "my-lily-lexer.hh"
#include "debug.hh"
#include "source-file.hh"
-#include "parseconstruct.hh"
#include "main.hh"
+#include "scope.hh"
+#include "input.hh"
+#include "moment.hh"
static Keyword_ent the_key_tab[]={
+ {"alias", ALIAS},
+ {"apply", APPLY},
+ {"arpeggio", ARPEGGIO },
+ {"autochange", AUTOCHANGE},
+ {"spanrequest", SPANREQUEST},
+ {"commandspanrequest", COMMANDSPANREQUEST},
+ {"simultaneous", SIMULTANEOUS},
+ {"sequential", SEQUENTIAL},
{"accepts", ACCEPTS},
+ {"alternative", ALTERNATIVE},
{"bar", BAR},
- {"break", BREAK},
- {"cadenza", CADENZA},
- {"clear", CLEAR},
+ {"breathe", BREATHE},
+ {"char", CHAR_T},
+ {"chordmodifiers", CHORDMODIFIERS},
+ {"chords", CHORDS},
{"clef", CLEF},
{"cm", CM_T},
{"consists", CONSISTS},
- {"contains", CONTAINS},
+ {"consistsend", CONSISTSEND},
+ {"context", CONTEXT},
+ {"default", DEFAULT},
+ {"denies", DENIES},
{"duration", DURATION},
- {"absdynamic", ABSDYNAMIC},
+ {"dynamicscript", DYNAMICSCRIPT},
+ {"elementdescriptions", ELEMENTDESCRIPTIONS},
+ {"font", FONT},
+ {"grace", GRACE},
+ {"glissando", GLISSANDO},
+ {"header", HEADER},
{"in", IN_T},
- {"translator", TRANSLATOR},
- {"type", TYPE},
- {"lyric", LYRIC},
+ {"lyrics", LYRICS},
{"key", KEY},
- {"melodic" , MELODIC},
- {"melodic_request", MELODIC_REQUEST},
- {"meter", METER},
+ {"mark", MARK},
+ {"pitch", PITCH},
+ {"time", TIME_T},
+ {"times", TIMES},
{"midi", MIDI},
{"mm", MM_T},
- {"multi", MULTI},
- {"header", HEADER},
- {"notenames", NOTENAMES},
- {"octave", OCTAVE},
- {"output", OUTPUT},
+ {"name", NAME},
+ {"pitchnames", PITCHNAMES},
+ {"notes", NOTES},
+ {"outputproperty", OUTPUTPROPERTY},
+ {"override", OVERRIDE},
+ {"set", SET},
+ {"revert", REVERT},
{"partial", PARTIAL},
{"paper", PAPER},
+ {"penalty", PENALTY},
{"property", PROPERTY},
{"pt", PT_T},
+ {"relative", RELATIVE},
+ {"remove", REMOVE},
+ {"repeat", REPEAT},
+ {"addlyrics", ADDLYRICS},
+ {"partcombine", PARTCOMBINE},
{"score", SCORE},
{"script", SCRIPT},
- {"shape", SHAPE},
+ {"stylesheet", STYLESHEET},
{"skip", SKIP},
- {"staff", STAFF},
- {"table", TABLE},
- {"spandynamic", SPANDYNAMIC},
- {"symboltables", SYMBOLTABLES},
{"tempo", TEMPO},
- {"texid", TEXID},
- {"textstyle", TEXTSTYLE},
+ {"translator", TRANSLATOR},
{"transpose", TRANSPOSE},
- {"version", VERSION},
- {"grouping", GROUPING},
+ {"type", TYPE},
+ {"unset", UNSET},
{0,0}
};
-My_lily_lexer::My_lily_lexer()
+My_lily_lexer::My_lily_lexer ()
{
keytable_p_ = new Keyword_table (the_key_tab);
- identifier_p_dict_p_ = new Dictionary<Identifier*>;
+ toplevel_variable_tab_ = new Scheme_hash_table ;
+ scope_p_ = new Scope (toplevel_variable_tab_);
+
+ scope_l_arr_.push (scope_p_);
+
errorlevel_i_ = 0;
- post_quotes_b_ = false;
- note_tab_p_ = new Notename_table;
+ main_input_b_ = false;
}
int
return keytable_p_->lookup (s.ch_C ());
}
-Identifier*
+SCM
My_lily_lexer::lookup_identifier (String s)
{
- if (!identifier_p_dict_p_->elt_b (s))
- return 0;
-
- return (*identifier_p_dict_p_)[s];
+ SCM sym = ly_symbol2scm (s.ch_C ());
+
+ for (int i = scope_l_arr_.size (); i--;)
+ {
+ SCM val = SCM_UNSPECIFIED;
+ if (scope_l_arr_[i]->try_retrieve (sym, &val))
+ return val;
+ }
+ return SCM_UNSPECIFIED;
}
void
My_lily_lexer::start_main_input ()
{
- if (!monitor->silent_b ("InitDeclarations") && check_debug)
- print_declarations (true);
- if (!monitor->silent_b ("InitLexer") && check_debug)
- set_debug (1);
-
new_input (main_input_str_, source_global_l);
-
- print_declarations(true);
+ allow_includes_b_ = allow_includes_b_ && ! (safe_global_b);
}
void
-My_lily_lexer::set_identifier (String name_str, Identifier*i)
+My_lily_lexer::set_identifier (String name_str, SCM s)
{
- Identifier *old = lookup_identifier (name_str);
- if (old)
+ if (lookup_keyword (name_str) >= 0)
{
- old->warning(_("redeclaration of \\") + name_str);
- delete old;
+ warning (_f ("Identifier name is a keyword: `%s'", name_str));
}
- (*identifier_p_dict_p_)[name_str] = i;
+
+ scope_l_arr_.top ()->set (name_str, s);
}
-My_lily_lexer::~My_lily_lexer()
+My_lily_lexer::~My_lily_lexer ()
{
delete keytable_p_;
-
- for (Assoc_iter<String,Identifier*>
- ai (*identifier_p_dict_p_); ai.ok(); ai++)
- {
- DOUT << "deleting: " << ai.key()<<'\n';
- delete ai.val();
- }
- delete note_tab_p_;
- delete identifier_p_dict_p_;
-}
-void
-My_lily_lexer::print_declarations (bool init_b) const
-{
- for (Assoc_iter<String,Identifier*> ai (*identifier_p_dict_p_);
- ai.ok(); ai++)
- {
- if (ai.val()->init_b_ == init_b)
- {
- DOUT << ai.key() << '=';
- ai.val()->print ();
- }
- }
+ scm_unprotect_object (toplevel_variable_tab_->self_scm ());
+ delete scope_p_ ;
}
+
+
void
My_lily_lexer::LexerError (char const *s)
{
- if (include_stack_.empty())
+ if (include_stack_.empty ())
{
- *mlog << _("error at EOF") << s << '\n';
+ progress_indication (_f ("error at EOF: %s", s)+ String ("\n"));
}
else
{
errorlevel_i_ |= 1;
- Input spot (source_file_l(),here_ch_C());
+ Input spot (source_file_l (),here_ch_C ());
spot.error (s);
}
}
-Melodic_req*
-My_lily_lexer::lookup_melodic_req_l (String s)
-{
- return note_tab_p_->get_l (s);
-}
-
-void
-My_lily_lexer::add_notename (String s, Melodic_req *p)
-{
- note_tab_p_->add (s,p);
-}
-
-void
-My_lily_lexer::clear_notenames()
-{
- delete note_tab_p_;
- note_tab_p_ = new Notename_table;
-}
-
char
-My_lily_lexer::escaped_char(char c) const
+My_lily_lexer::escaped_char (char c) const
{
- switch(c)
+ switch (c)
{
case 'n':
return '\n';
}
return 0;
}
+
+Input
+My_lily_lexer::here_input () const
+{
+ Source_file * f_l= source_file_l ();
+ return Input (f_l, (char*)here_ch_C ());
+}
projects / lilypond.git / blobdiff