X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcontext-def.cc;h=f4023a09a110833cb56ad13f83d8c2dbf75a4059;hb=b6b0738a3323e7648f19ab2b0bcfc106fc5a87d5;hp=fc9466fb1a6beaf67b86a6c6f582ea6708b36727;hpb=6eced6a93bbfda6e6af37a7d77a8e75a5052dbee;p=lilypond.git diff --git a/lily/context-def.cc b/lily/context-def.cc index fc9466fb1a..f4023a09a1 100644 --- a/lily/context-def.cc +++ b/lily/context-def.cc @@ -3,7 +3,7 @@ source file of the GNU LilyPond music typesetter - (c) 2000--2005 Han-Wen Nienhuys + (c) 2000--2007 Han-Wen Nienhuys */ /* TODO: should junk this class an replace by @@ -11,11 +11,10 @@ #include "context-def.hh" -#include "engraver.hh" +#include "context.hh" +#include "international.hh" #include "output-def.hh" -#include "performer.hh" -#include "score-context.hh" -#include "translator-group.hh" +#include "translator.hh" #include "warn.hh" Context_def::Context_def () @@ -28,14 +27,21 @@ Context_def::Context_def () context_name_ = SCM_EOL; default_child_ = SCM_EOL; description_ = SCM_EOL; + input_location_ = SCM_EOL; smobify_self (); + input_location_ = make_input (Input ()); context_name_ = ly_symbol2scm (""); } +Input * +Context_def::origin () const +{ + return unsmob_input (input_location_); +} + Context_def::Context_def (Context_def const &s) - : Input (s) { context_aliases_ = SCM_EOL; translator_group_type_ = SCM_EOL; @@ -45,10 +51,11 @@ Context_def::Context_def (Context_def const &s) context_name_ = SCM_EOL; description_ = SCM_EOL; default_child_ = SCM_EOL; - + input_location_ = SCM_EOL; smobify_self (); - description_ = s.description_; + description_ = s.description_; + input_location_ = make_input (*s.origin ()); default_child_ = s.default_child_; accept_mods_ = s.accept_mods_; property_ops_ = s.property_ops_; @@ -80,6 +87,8 @@ Context_def::print_smob (SCM smob, SCM port, scm_print_state*) SCM Context_def::mark_smob (SCM smob) { + ASSERT_LIVE_IS_ALLOWED (); + Context_def *me = (Context_def *) SCM_CELL_WORD_1 (smob); scm_gc_mark (me->description_); @@ -89,6 +98,7 @@ Context_def::mark_smob (SCM smob) scm_gc_mark (me->property_ops_); scm_gc_mark (me->translator_group_type_); scm_gc_mark (me->default_child_); + scm_gc_mark (me->input_location_); return me->context_name_; } @@ -104,31 +114,28 @@ Context_def::add_context_mod (SCM mod) } /* - other modifiers take symbols as argument. + other modifiers take symbols as argument. */ SCM sym = scm_cadr (mod); if (scm_is_string (sym)) sym = scm_string_to_symbol (sym); if (ly_symbol2scm ("default-child") == tag) - { - default_child_ = sym; - } + default_child_ = sym; else if (ly_symbol2scm ("consists") == tag - || ly_symbol2scm ("consists-end") == tag - || ly_symbol2scm ("remove") == tag) + || ly_symbol2scm ("consists-end") == tag + || ly_symbol2scm ("remove") == tag) { if (!get_translator (sym)) error (_f ("program has no such type: `%s'", - ly_symbol2string (sym).to_str0 ())); + ly_symbol2string (sym).c_str ())); else translator_mods_ = scm_cons (scm_list_2 (tag, sym), translator_mods_); } else if (ly_symbol2scm ("accepts") == tag || ly_symbol2scm ("denies") == tag) accept_mods_ = scm_cons (scm_list_2 (tag, sym), accept_mods_); - else if (ly_symbol2scm ("poppush") == tag - || ly_symbol2scm ("pop") == tag + else if (ly_symbol2scm ("pop") == tag || ly_symbol2scm ("push") == tag || ly_symbol2scm ("assign") == tag || ly_symbol2scm ("unset") == tag) @@ -143,12 +150,6 @@ Context_def::add_context_mod (SCM mod) programming_error ("unknown context mod tag"); } -SCM -Context_def::get_context_name () const -{ - return context_name_; -} - SCM Context_def::get_accepted (SCM user_mod) const { @@ -171,11 +172,10 @@ Context_def::get_accepted (SCM user_mod) const acc = scm_delete_x (def, acc); acc = scm_cons (def, acc); } - + return acc; } - SCM Context_def::get_default_child (SCM user_mod) const { @@ -193,42 +193,42 @@ Context_def::get_default_child (SCM user_mod) const return name; } -Link_array +vector Context_def::path_to_acceptable_context (SCM type_sym, Output_def *odef) const { assert (scm_is_symbol (type_sym)); SCM accepted = get_accepted (SCM_EOL); - Link_array accepteds; + vector accepteds; for (SCM s = accepted; scm_is_pair (s); s = scm_cdr (s)) if (Context_def *t = unsmob_context_def (find_context_def (odef, scm_car (s)))) - accepteds.push (t); + accepteds.push_back (t); - Link_array best_result; - for (int i = 0; i < accepteds.size (); i++) + vector best_result; + for (vsize i = 0; i < accepteds.size (); i++) { /* do not check aliases, because \context Staff should not create RhythmicStaff. */ if (ly_is_equal (accepteds[i]->get_context_name (), type_sym)) { - best_result.push (accepteds[i]); + best_result.push_back (accepteds[i]); return best_result; } } - int best_depth = INT_MAX; - for (int i = 0; i < accepteds.size (); i++) + vsize best_depth = INT_MAX; + for (vsize i = 0; i < accepteds.size (); i++) { Context_def *g = accepteds[i]; - Link_array result + vector result = g->path_to_acceptable_context (type_sym, odef); if (result.size () && result.size () < best_depth) { best_depth = result.size (); - result.insert (g, 0); + result.insert (result.begin (), g); best_result = result; } } @@ -254,130 +254,30 @@ Context_def::get_translator_names (SCM user_mod) const if (ly_symbol2scm ("consists") == tag) l1 = scm_cons (arg, l1); else if (ly_symbol2scm ("remove") == tag) - { - l1 = scm_delete_x (arg, l1); - } + l1 = scm_delete_x (arg, l1); } return l1; } -SCM -filter_performers (SCM ell) -{ - SCM *tail = ℓ - for (SCM p = ell; scm_is_pair (p); p = scm_cdr (p)) - { - if (dynamic_cast (unsmob_translator (scm_car (*tail)))) - *tail = scm_cdr (*tail); - else - tail = SCM_CDRLOC(*tail); - } - return ell; -} - -SCM -filter_engravers (SCM ell) -{ - SCM *tail = ℓ - for (SCM p = ell; scm_is_pair (p); p = scm_cdr (p)) - { - if (dynamic_cast (unsmob_translator (scm_car (*tail)))) - *tail = scm_cdr (*tail); - else - tail = SCM_CDRLOC(*tail); - } - return ell; -} - Context * -Context_def::instantiate (SCM ops, Object_key const *key) +Context_def::instantiate (SCM ops) { - Context *tg = 0; - - if (context_name_ == ly_symbol2scm ("Score")) - tg = new Score_context (key); - else - tg = new Context (key); - - tg->definition_ = self_scm (); - - SCM trans_names = get_translator_names (ops); - - Translator_group *g = dynamic_cast - (get_translator (translator_group_type_)); - g = dynamic_cast (g->clone ()); - - SCM trans_list = SCM_EOL; - - for (SCM s = trans_names; scm_is_pair (s); s = scm_cdr (s)) - { - Translator *t = get_translator (scm_car (s)); - if (!t) - warning (_f ("can't find: `%s'", s)); - else - { - Translator *tr = t->clone (); - SCM str = tr->self_scm (); - - if (tr->must_be_last ()) - { - SCM cons = scm_cons (str, SCM_EOL); - if (scm_is_pair (trans_list)) - scm_set_cdr_x (scm_last_pair (trans_list), cons); - else - trans_list = cons; - } - else - { - trans_list = scm_cons (str, trans_list); - } - - tr->daddy_context_ = tg; - scm_gc_unprotect_object (str); - } - } - - - /* - Ugh, todo: should just make a private - copy of Context_def with the user mods. - */ + Context *context = new Context (); - g->simple_trans_list_ = trans_list; + context->definition_ = self_scm (); + context->definition_mods_ = ops; + context->aliases_ = context_aliases_; + context->accepts_list_ = get_accepted (ops); - tg->implementation_ = g->self_scm (); - if (dynamic_cast (g)) - g->simple_trans_list_ = filter_performers (g->simple_trans_list_); - else if (dynamic_cast (g)) - g->simple_trans_list_ = filter_engravers (g->simple_trans_list_); - - g->daddy_context_ = tg; - tg->aliases_ = context_aliases_; - - scm_gc_unprotect_object (g->self_scm ()); - - tg->accepts_list_ = get_accepted (ops); - - return tg; -} - -SCM -Context_def::clone_scm () const -{ - Context_def *t = new Context_def (*this); - SCM x = t->self_scm (); - scm_gc_unprotect_object (x); - return x; + return context; } SCM Context_def::make_scm () { Context_def *t = new Context_def; - SCM x = t->self_scm (); - scm_gc_unprotect_object (x); - return x; + return t->unprotect (); } void