X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcontext.cc;fp=lily%2Fcontext.cc;h=4d949e8379c0a02f34003794b7f5e62bf3ec0b80;hb=32a34dcef0c0041c6d62677487a380b5c8b85712;hp=0d7fbe35f6d1ffa65deba31f35405d22897bb030;hpb=f41973ff763d5972a85995b6d40c864281ec6714;p=lilypond.git diff --git a/lily/context.cc b/lily/context.cc index 0d7fbe35f6..4d949e8379 100644 --- a/lily/context.cc +++ b/lily/context.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2004--2011 Han-Wen Nienhuys + Copyright (C) 2004--2012 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -35,8 +35,8 @@ bool Context::is_removable () const { - return context_list_ == SCM_EOL && ! iterator_count_ - && !dynamic_cast (daddy_context_); + return context_list_ == SCM_EOL && ! client_count_ + && !dynamic_cast (daddy_context_); } void @@ -48,12 +48,12 @@ Context::check_removal () ctx->check_removal (); if (ctx->is_removable ()) - { - recurse_over_translators (ctx, &Translator::finalize, - &Translator_group::finalize, - UP); - send_stream_event (ctx, "RemoveContext", 0, 0); - } + { + recurse_over_translators (ctx, &Translator::finalize, + &Translator_group::finalize, + UP); + send_stream_event (ctx, "RemoveContext", 0, 0); + } } } @@ -72,18 +72,17 @@ void Context::add_context (Context *child) { context_list_ = ly_append2 (context_list_, - scm_cons (child->self_scm (), SCM_EOL)); + scm_cons (child->self_scm (), SCM_EOL)); child->daddy_context_ = this; this->events_below_->register_as_listener (child->events_below_); } - Context::Context () { daddy_context_ = 0; aliases_ = SCM_EOL; - iterator_count_ = 0; + client_count_ = 0; implementation_ = 0; properties_scm_ = SCM_EOL; accepts_list_ = SCM_EOL; @@ -92,6 +91,7 @@ Context::Context () definition_mods_ = SCM_EOL; event_source_ = 0; events_below_ = 0; + ancestor_lookup_ = SCM_UNDEFINED; smobify_self (); @@ -121,18 +121,18 @@ Context::create_unique_context (SCM name, string id, SCM operations) // Iterate through the path and create all of the implicit contexts. for (vsize i = 0; i < path.size (); i++) - { - SCM ops = SCM_EOL; - string id_str = "\\new"; - if (i == path.size () - 1) - { - ops = operations; - id_str = id; - } - current = current->create_context (path[i], - id_str, - ops); - } + { + SCM ops = SCM_EOL; + string id_str = "\\new"; + if (i == path.size () - 1) + { + ops = operations; + id_str = id; + } + current = current->create_context (path[i], + id_str, + ops); + } return current; } @@ -147,7 +147,7 @@ Context::create_unique_context (SCM name, string id, SCM operations) else { warning (_f ("cannot find or create new `%s'", - ly_symbol2string (name).c_str ())); + ly_symbol2string (name).c_str ())); ret = 0; } return ret; @@ -172,7 +172,7 @@ Context::find_create_context (SCM n, string id, SCM operations) return tg; } - vector path = path_to_acceptable_context (n); + vector path = path_to_acceptable_context (n); if (path.size ()) { @@ -180,17 +180,17 @@ Context::find_create_context (SCM n, string id, SCM operations) // start at 1. The first one (index 0) will be us. for (vsize i = 0; i < path.size (); i++) - { - SCM ops = (i == path.size () -1) ? operations : SCM_EOL; + { + SCM ops = (i == path.size () - 1) ? operations : SCM_EOL; - string this_id = ""; - if (i == path.size () -1) - this_id = id; + string this_id = ""; + if (i == path.size () - 1) + this_id = id; - current = current->create_context (path[i], - this_id, - ops); - } + current = current->create_context (path[i], + this_id, + ops); + } return current; } @@ -205,7 +205,7 @@ Context::find_create_context (SCM n, string id, SCM operations) else { warning (_f ("cannot find or create `%s' called `%s'", - ly_symbol2string (n).c_str (), id)); + ly_symbol2string (n).c_str (), id)); ret = 0; } return ret; @@ -223,16 +223,16 @@ void Context::set_property_from_event (SCM sev) { Stream_event *ev = unsmob_stream_event (sev); - + SCM sym = ev->get_property ("symbol"); if (scm_is_symbol (sym)) { SCM val = ev->get_property ("value"); bool ok = true; if (val != SCM_EOL) - ok = type_check_assignment (sym, val, ly_symbol2scm ("translation-type?")); + ok = type_check_assignment (sym, val, ly_symbol2scm ("translation-type?")); if (ok) - set_property (sym, val); + set_property (sym, val); } } @@ -241,7 +241,7 @@ void Context::unset_property_from_event (SCM sev) { Stream_event *ev = unsmob_stream_event (sev); - + SCM sym = ev->get_property ("symbol"); type_check_assignment (sym, SCM_EOL, ly_symbol2scm ("translation-type?")); unset_property (sym); @@ -256,45 +256,45 @@ void Context::create_context_from_event (SCM sev) { Stream_event *ev = unsmob_stream_event (sev); - + string id = ly_scm2string (ev->get_property ("id")); SCM ops = ev->get_property ("ops"); SCM type_scm = ev->get_property ("type"); string type = ly_symbol2string (type_scm); - - vector path = path_to_acceptable_context (type_scm); + + vector path = path_to_acceptable_context (type_scm); if (path.size () != 1) { - programming_error (_f ("Invalid CreateContext event: Cannot create %s context", type.c_str ())); + programming_error (to_string ("Invalid CreateContext event: Cannot create %s context", type.c_str ())); return; } Context_def *cdef = path[0]; - + Context *new_context = cdef->instantiate (ops); new_context->id_string_ = id; - + /* Register various listeners: - Make the new context hear events that universally affect contexts - connect events_below etc. properly */ /* We want to be the first ones to hear our own events. Therefore, wait before registering events_below_ */ new_context->event_source ()-> - add_listener (GET_LISTENER (new_context->create_context_from_event), - ly_symbol2scm ("CreateContext")); + add_listener (GET_LISTENER (new_context->create_context_from_event), + ly_symbol2scm ("CreateContext")); new_context->event_source ()-> - add_listener (GET_LISTENER (new_context->remove_context), - ly_symbol2scm ("RemoveContext")); + add_listener (GET_LISTENER (new_context->remove_context), + ly_symbol2scm ("RemoveContext")); new_context->event_source ()-> - add_listener (GET_LISTENER (new_context->change_parent), - ly_symbol2scm ("ChangeParent")); + add_listener (GET_LISTENER (new_context->change_parent), + ly_symbol2scm ("ChangeParent")); new_context->event_source ()-> - add_listener (GET_LISTENER (new_context->set_property_from_event), - ly_symbol2scm ("SetProperty")); + add_listener (GET_LISTENER (new_context->set_property_from_event), + ly_symbol2scm ("SetProperty")); new_context->event_source ()-> - add_listener (GET_LISTENER (new_context->unset_property_from_event), - ly_symbol2scm ("UnsetProperty")); + add_listener (GET_LISTENER (new_context->unset_property_from_event), + ly_symbol2scm ("UnsetProperty")); new_context->events_below_->register_as_listener (new_context->event_source_); this->add_context (new_context); @@ -309,40 +309,40 @@ Context::create_context_from_event (SCM sev) apply_property_operations (new_context, ops); send_stream_event (this, "AnnounceNewContext", 0, - ly_symbol2scm ("context"), new_context->self_scm (), - ly_symbol2scm ("creator"), sev); + ly_symbol2scm ("context"), new_context->self_scm (), + ly_symbol2scm ("creator"), sev); } -vector +vector Context::path_to_acceptable_context (SCM name) const { // The 'accepts elements in definition_mods_ is a list of ('accepts string), // but the Context_def expects to see elements of the form ('accepts symbol). SCM accepts = SCM_EOL; - for (SCM s = scm_reverse (definition_mods_); scm_is_pair (s); s = scm_cdr (s)) + for (SCM s = definition_mods_; scm_is_pair (s); s = scm_cdr (s)) if (scm_caar (s) == ly_symbol2scm ("accepts")) { - SCM elt = scm_list_2 (scm_caar (s), scm_string_to_symbol (scm_cadar (s))); - accepts = scm_cons (elt, accepts); + SCM elt = scm_list_2 (scm_caar (s), scm_string_to_symbol (scm_cadar (s))); + accepts = scm_cons (elt, accepts); } return unsmob_context_def (definition_)->path_to_acceptable_context (name, - get_output_def (), - accepts); - + get_output_def (), + scm_reverse_x (accepts, SCM_EOL)); + } Context * Context::create_context (Context_def *cdef, - string id, - SCM ops) + string id, + SCM ops) { infant_event_ = 0; /* TODO: This is fairly misplaced. We can fix this when we have taken out all iterator specific stuff from the Context class */ event_source_-> - add_listener (GET_LISTENER (acknowledge_infant), - ly_symbol2scm ("AnnounceNewContext")); + add_listener (GET_LISTENER (acknowledge_infant), + ly_symbol2scm ("AnnounceNewContext")); /* The CreateContext creates a new context, and sends an announcement of the new context through another event. That event will be stored in infant_event_ to create a return value. */ @@ -351,8 +351,8 @@ Context::create_context (Context_def *cdef, ly_symbol2scm ("type"), cdef->get_context_name (), ly_symbol2scm ("id"), ly_string2scm (id)); event_source_-> - remove_listener (GET_LISTENER (acknowledge_infant), - ly_symbol2scm ("AnnounceNewContext")); + remove_listener (GET_LISTENER (acknowledge_infant), + ly_symbol2scm ("AnnounceNewContext")); assert (infant_event_); SCM infant_scm = infant_event_->get_property ("context"); @@ -375,8 +375,8 @@ SCM Context::default_child_context_name () const { return scm_is_pair (accepts_list_) - ? scm_car (accepts_list_) - : SCM_EOL; + ? scm_car (accepts_list_) + : SCM_EOL; } bool @@ -396,10 +396,10 @@ Context::get_default_interpreter (string context_id) string name = ly_symbol2string (nm); Context_def *t = unsmob_context_def (st); if (!t) - { - warning (_f ("cannot find or create: `%s'", name.c_str ())); - t = unsmob_context_def (this->definition_); - } + { + warning (_f ("cannot find or create: `%s'", name.c_str ())); + t = unsmob_context_def (this->definition_); + } Context *tg = create_context (t, context_id, SCM_EOL); return tg->get_default_interpreter (context_id); @@ -453,10 +453,10 @@ be called from any other place than the send_stream_event macro. void Context::internal_send_stream_event (SCM type, Input *origin, SCM props[]) { - Stream_event *e = new Stream_event (type, origin); + Stream_event *e = new Stream_event (make_event_class (type), origin); for (int i = 0; props[i]; i += 2) { - e->set_property (props[i], props[i+1]); + e->set_property (props[i], props[i + 1]); } event_source_->broadcast (e); e->unprotect (); @@ -482,7 +482,7 @@ Context::add_alias (SCM sym) /* we don't (yet) instrument context properties */ void -Context::instrumented_set_property (SCM sym, SCM val, const char*, int, const char*) +Context::instrumented_set_property (SCM sym, SCM val, const char *, int, const char *) { internal_set_property (sym, val); } @@ -546,12 +546,12 @@ Context::disconnect_from_parent () */ Context * find_context_below (Context *where, - SCM type, string id) + SCM type, string id) { if (where->is_alias (type)) { if (id == "" || where->id_string () == id) - return where; + return where; } Context *found = 0; @@ -594,6 +594,14 @@ Context::get_score_context () const return 0; } +SCM +Context::make_event_class (SCM event_type) +{ + if (SCM_UNBNDP (ancestor_lookup_)) + ancestor_lookup_ = get_global_context ()->ancestor_lookup_; + return scm_hashq_ref (ancestor_lookup_, event_type, SCM_EOL); +} + Output_def * Context::get_output_def () const { @@ -662,6 +670,8 @@ Context::mark_smob (SCM sm) if (me->events_below_) scm_gc_mark (me->events_below_->self_scm ()); + scm_gc_mark (me->ancestor_lookup_); + return me->properties_scm_; } @@ -712,11 +722,11 @@ measure_position (Context const *context) m = *unsmob_moment (sm); if (m.main_part_ < Rational (0)) - { - Rational length (measure_length (context)); - while (m.main_part_ < Rational (0)) - m.main_part_ += length; - } + { + Rational length (measure_length (context)); + while (m.main_part_ < Rational (0)) + m.main_part_ += length; + } } return m; @@ -730,9 +740,9 @@ measure_position (Context const *context, Duration const *dur) Moment pos = measure_position (context); Rational dur_length = dur ? dur->get_length () : Rational (0); - Moment end_pos = pos.grace_part_ < Rational(0) - ? Moment(pos.main_part_, pos.grace_part_ + dur_length) - : Moment(pos.main_part_ + dur_length, 0); + Moment end_pos = pos.grace_part_ < Rational (0) + ? Moment (pos.main_part_, pos.grace_part_ + dur_length) + : Moment (pos.main_part_ + dur_length, 0); return end_pos; } @@ -751,7 +761,6 @@ measure_number (Context const *context) return bn; } - void set_context_property_on_children (Context *trans, SCM sym, SCM val) { @@ -781,7 +790,7 @@ check_repeat_count_visibility (Context const *context, SCM count) { SCM proc = context->get_property ("repeatCountVisibility"); return (ly_is_procedure (proc) - && to_boolean (scm_call_2 (proc, - count, - context->self_scm ()))); + && to_boolean (scm_call_2 (proc, + count, + context->self_scm ()))); }