X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fcontext.cc;h=491ea8f0d864e4ffc0cbe729f5b0e0d4d8f25b12;hb=a02cfaa060e2c5b0d21236016ee5328d21c2f8cb;hp=4d949e8379c0a02f34003794b7f5e62bf3ec0b80;hpb=46e296f5381495ce30108aa981e549d61e55a009;p=lilypond.git diff --git a/lily/context.cc b/lily/context.cc index 4d949e8379..491ea8f0d8 100644 --- a/lily/context.cc +++ b/lily/context.cc @@ -86,12 +86,12 @@ Context::Context () implementation_ = 0; properties_scm_ = SCM_EOL; accepts_list_ = SCM_EOL; + default_child_ = SCM_EOL; context_list_ = SCM_EOL; definition_ = SCM_EOL; definition_mods_ = SCM_EOL; event_source_ = 0; events_below_ = 0; - ancestor_lookup_ = SCM_UNDEFINED; smobify_self (); @@ -105,7 +105,7 @@ Context::Context () /* TODO: this shares code with find_create_context (). */ Context * -Context::create_unique_context (SCM name, string id, SCM operations) +Context::create_unique_context (SCM name, const string &id, SCM operations) { /* Don't create multiple score contexts. @@ -154,14 +154,35 @@ Context::create_unique_context (SCM name, string id, SCM operations) } Context * -Context::find_create_context (SCM n, string id, SCM operations) +Context::find_create_context (SCM n, const string &id, SCM operations) { /* Don't create multiple score contexts. */ Global_context *gthis = dynamic_cast (this); - if (gthis && gthis->get_score_context ()) - return gthis->get_score_context ()->find_create_context (n, id, operations); + if (gthis) + { + if (gthis->get_score_context ()) + return gthis->get_score_context ()->find_create_context (n, id, operations); + + // Special case: If we use \set Timing.xxx = whatever before + // Score is established, the alias of Score to Timing will not + // be taken into account. We check for this particular case + // here. Aliases apart from Score-level ones don't warrant + // context creation as they could create unwanted contexts, like + // RhythmicVoice instead of Voice. Creating a Score context, + // however, can't really do anything wrong. + + SCM score_name = default_child_context_name (); + SCM score_def = find_context_def (get_output_def (), score_name); + + if (Context_def *cd = unsmob_context_def (score_def)) + { + if (cd->is_alias (n)) + return create_context (cd, id, operations); + } + } + if (Context *existing = find_context_below (this, n, id)) return existing; @@ -228,9 +249,15 @@ Context::set_property_from_event (SCM sev) if (scm_is_symbol (sym)) { SCM val = ev->get_property ("value"); + + if (SCM_UNBNDP (val)) { + unset_property (sym); + return; + } + 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); } @@ -334,7 +361,7 @@ Context::path_to_acceptable_context (SCM name) const Context * Context::create_context (Context_def *cdef, - string id, + const string &id, SCM ops) { infant_event_ = 0; @@ -374,9 +401,7 @@ Context::create_context (Context_def *cdef, SCM Context::default_child_context_name () const { - return scm_is_pair (accepts_list_) - ? scm_car (accepts_list_) - : SCM_EOL; + return default_child_; } bool @@ -386,7 +411,7 @@ Context::is_bottom_context () const } Context * -Context::get_default_interpreter (string context_id) +Context::get_default_interpreter (const string &context_id) { if (!is_bottom_context ()) { @@ -400,9 +425,19 @@ Context::get_default_interpreter (string context_id) 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); + if (scm_is_symbol (t->get_default_child (SCM_EOL))) + { + Context *tg = create_context (t, "\\new", SCM_EOL); + return tg->get_default_interpreter (context_id); + } + return create_context (t, context_id, SCM_EOL); + } + else if (!context_id.empty () && context_id != id_string ()) + { + if (daddy_context_ && !dynamic_cast (daddy_context_)) + return daddy_context_->get_default_interpreter (context_id); + warning (_f ("cannot find or create new Bottom = \"%s\"", + context_id.c_str ())); } return this; } @@ -453,7 +488,9 @@ 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 (make_event_class (type), origin); + Stream_event *e = new Stream_event + (scm_call_1 (ly_lily_module_constant ("ly:make-event-class"), type), + origin); for (int i = 0; props[i]; i += 2) { e->set_property (props[i], props[i + 1]); @@ -465,10 +502,9 @@ Context::internal_send_stream_event (SCM type, Input *origin, SCM props[]) bool Context::is_alias (SCM sym) const { - if (sym == ly_symbol2scm ("Bottom") - && !scm_is_pair (accepts_list_)) - return true; - if (sym == unsmob_context_def (definition_)->get_context_name ()) + if (scm_is_eq (sym, ly_symbol2scm ("Bottom"))) + return is_bottom_context (); + if (scm_is_eq (sym, context_name_symbol ())) return true; return scm_c_memq (sym, aliases_) != SCM_BOOL_F; @@ -546,7 +582,7 @@ Context::disconnect_from_parent () */ Context * find_context_below (Context *where, - SCM type, string id) + SCM type, const string &id) { if (where->is_alias (type)) { @@ -594,14 +630,6 @@ 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 { @@ -660,6 +688,7 @@ Context::mark_smob (SCM sm) scm_gc_mark (me->definition_mods_); scm_gc_mark (me->properties_scm_); scm_gc_mark (me->accepts_list_); + scm_gc_mark (me->default_child_); if (me->implementation_) scm_gc_mark (me->implementation_->self_scm ()); @@ -670,8 +699,6 @@ 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_; }