source file of the GNU LilyPond music typesetter
- (c) 1997--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include <ctype.h>
-
#include <sstream>
#include "lily-proto.hh"
#include "scm-hash.hh"
#include "interval.hh"
-
+#include "input-file-results.hh"
#include "lily-guile.hh"
#include "parser.hh"
#include "keyword.hh"
#include "main.hh"
#include "input.hh"
#include "moment.hh"
+#include "ly-modules.hh"
+
static Keyword_ent the_key_tab[]={
+ {"acciaccatura", ACCIACCATURA},
+ {"accepts", ACCEPTS},
+ {"addlyrics", ADDLYRICS},
+ {"addquote", ADDQUOTE},
{"alias", ALIAS},
+ {"alternative", ALTERNATIVE},
{"apply", APPLY},
- {"arpeggio", ARPEGGIO },
+ {"applycontext", APPLYCONTEXT},
+ {"applyoutput", APPLYOUTPUT},
+ {"appoggiatura", APPOGGIATURA},
{"autochange", AUTOCHANGE},
- {"spanrequest", SPANREQUEST},
- {"commandspanrequest", COMMANDSPANREQUEST},
- {"simultaneous", SIMULTANEOUS},
- {"sequential", SEQUENTIAL},
- {"accepts", ACCEPTS},
- {"alternative", ALTERNATIVE},
{"bar", BAR},
{"breathe", BREATHE},
- {"char", CHAR_T},
- {"chordmodifiers", CHORDMODIFIERS},
+ {"change", CHANGE},
{"chords", CHORDS},
{"clef", CLEF},
- {"cm", CM_T},
{"consists", CONSISTS},
{"consistsend", CONSISTSEND},
{"context", CONTEXT},
{"default", DEFAULT},
{"denies", DENIES},
- {"duration", DURATION},
- {"dynamicscript", DYNAMICSCRIPT},
- {"grobdescriptions", GROBDESCRIPTIONS},
+ {"drums", DRUMS},
+ {"description", DESCRIPTION},
{"figures",FIGURES},
{"grace", GRACE},
- {"glissando", GLISSANDO},
+ {"grobdescriptions", GROBDESCRIPTIONS},
{"header", HEADER},
- {"in", IN_T},
- {"lyrics", LYRICS},
{"key", KEY},
+ {"lyrics", LYRICS},
+ {"lyricsto", NEWADDLYRICS},
{"mark", MARK},
- {"pitch", PITCH},
- {"time", TIME_T},
- {"times", TIMES},
+ {"markup", MARKUP},
{"midi", MIDI},
- {"mm", MM_T},
{"name", NAME},
- {"pitchnames", PITCHNAMES},
+ {"new", NEWCONTEXT},
{"notes", NOTES},
- {"outputproperty", OUTPUTPROPERTY},
+ {"octave", OCTAVE},
+ {"once", ONCE},
{"override", OVERRIDE},
- {"set", SET},
- {"rest", REST},
- {"revert", REVERT},
- {"partial", PARTIAL},
{"paper", PAPER},
- {"penalty", PENALTY},
- {"property", PROPERTY},
- {"pt", PT_T},
+ {"partcombine", PARTCOMBINE},
+ {"partial", PARTIAL},
+ {"quote", QUOTE},
{"relative", RELATIVE},
{"remove", REMOVE},
{"repeat", REPEAT},
- {"addlyrics", ADDLYRICS},
- {"partcombine", PARTCOMBINE},
+ {"rest", REST},
+ {"revert", REVERT},
{"score", SCORE},
- {"script", SCRIPT},
- {"stylesheet", STYLESHEET},
+ {"sequential", SEQUENTIAL},
+ {"set", SET},
+ {"simultaneous", SIMULTANEOUS},
{"skip", SKIP},
+ {"tag", TAG},
{"tempo", TEMPO},
- {"translator", TRANSLATOR},
+ {"time", TIME_T},
+ {"times", TIMES},
{"transpose", TRANSPOSE},
+ {"transposition", TRANSPOSITION},
{"type", TYPE},
{"unset", UNSET},
+ {"with", WITH},
{0,0}
};
+
My_lily_lexer::My_lily_lexer ()
{
- keytable_p_ = new Keyword_table (the_key_tab);
- toplevel_variable_tab_ = new Scheme_hash_table ;
- scope_l_arr_.push (toplevel_variable_tab_);
+ // yy_flex_debug = 1;
+
+ keytable_ = new Keyword_table (the_key_tab);
+
+ chordmodifier_tab_ = scm_make_vector (gh_int2scm (1), SCM_EOL);
+ pitchname_tab_stack_ = SCM_EOL;
- errorlevel_i_ = 0;
+ scopes_ = SCM_EOL;
+
+ add_scope (ly_make_anonymous_module ());
+ errorlevel_ =0;
+
main_input_b_ = false;
}
+void
+My_lily_lexer::add_scope (SCM module)
+{
+ ly_reexport_module (scm_current_module ());
+ scm_set_current_module (module);
+ for (SCM s = scopes_; gh_pair_p (s); s = gh_cdr (s))
+ {
+ /*
+ UGH. how to do this more neatly?
+ */
+ SCM expr = scm_list_n (ly_symbol2scm ("module-use!"),
+ module, scm_list_n (ly_symbol2scm ("module-public-interface"),
+ gh_car (s), SCM_UNDEFINED),
+ SCM_UNDEFINED);
+
+ scm_primitive_eval (expr);
+ }
+
+ scopes_ = scm_cons (module, scopes_);
+}
+
+SCM
+My_lily_lexer::remove_scope ()
+{
+ SCM sc = gh_car (scopes_);
+ scopes_ = gh_cdr (scopes_);
+ scm_set_current_module (gh_car (scopes_));
+
+ return sc;
+}
+
+
int
My_lily_lexer::lookup_keyword (String s)
{
- return keytable_p_->lookup (s.ch_C ());
+ return keytable_->lookup (s.to_str0 ());
}
SCM
My_lily_lexer::lookup_identifier (String s)
{
- SCM sym = ly_symbol2scm (s.ch_C ());
-
- for (int i = scope_l_arr_.size (); i--;)
+ SCM sym = ly_symbol2scm (s.to_str0());
+ for (SCM s = scopes_; gh_pair_p (s); s = gh_cdr (s))
{
- SCM val = SCM_UNSPECIFIED;
- if (scope_l_arr_[i]->try_retrieve (sym, &val))
- return val;
+ SCM var = ly_module_lookup (gh_car (s), sym);
+ if (var != SCM_BOOL_F)
+ return scm_variable_ref (var);
}
- return SCM_UNSPECIFIED;
+
+ return SCM_UNDEFINED;
}
void
My_lily_lexer::start_main_input ()
{
- new_input (main_input_str_, source_global_l);
- allow_includes_b_ = allow_includes_b_ && ! (safe_global_b);
+ new_input (main_input_name_, &global_input_file->sources_);
+ allow_includes_b_ = allow_includes_b_ && ! safe_global_b;
+
+ scm_module_define (gh_car (scopes_),
+ ly_symbol2scm ("input-file-name"),
+ scm_makfrom0str (main_input_name_.to_str0 ()));
}
void
warning (_f ("Identifier name is a keyword: `%s'", str));
free (str);
}
-
- scope_l_arr_.top ()->set (scm_string_to_symbol (name), s);
+
+ SCM sym = scm_string_to_symbol (name);
+ SCM mod = gh_car (scopes_);
+
+ scm_module_define (mod, sym, s);
}
My_lily_lexer::~My_lily_lexer ()
{
- delete keytable_p_;
- scm_gc_unprotect_object (toplevel_variable_tab_->self_scm ());
+ delete keytable_;
}
void
My_lily_lexer::LexerError (char const *s)
{
- if (include_stack_.empty ())
+ if (include_stack_.is_empty ())
{
progress_indication (_f ("error at EOF: %s", s)+ String ("\n"));
}
else
{
- errorlevel_i_ |= 1;
- Input spot (source_file_l (),here_ch_C ());
+ errorlevel_ |= 1;
+ Input spot (get_source_file (), here_str0 ());
spot.error (s);
}
}
Input
My_lily_lexer::here_input () const
{
- Source_file * f_l= source_file_l ();
- return Input (f_l, (char*)here_ch_C ());
+ Source_file * f= get_source_file ();
+ return Input (f, (char*)here_str0 ());
+}
+
+void
+My_lily_lexer::prepare_for_next_token ()
+{
+ last_input_ = here_input ();
}
projects / lilypond.git / blobdiff