X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcontext.cc;h=caac314bf704bbfde3b49fc12efb64ed65da35ca;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=4d949e8379c0a02f34003794b7f5e62bf3ec0b80;hpb=caac677710724849651381d11577f61dd9618bcf;p=lilypond.git diff --git a/lily/context.cc b/lily/context.cc index 4d949e8379..caac314bf7 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--2012 Han-Wen Nienhuys + Copyright (C) 2004--2015 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 @@ -23,7 +23,6 @@ #include "dispatcher.hh" #include "global-context.hh" #include "international.hh" -#include "ly-smobs.icc" #include "main.hh" #include "output-def.hh" #include "profile.hh" @@ -44,7 +43,7 @@ Context::check_removal () { for (SCM p = context_list_; scm_is_pair (p); p = scm_cdr (p)) { - Context *ctx = unsmob_context (scm_car (p)); + Context *ctx = Context::unsmob (scm_car (p)); ctx->check_removal (); if (ctx->is_removable ()) @@ -57,11 +56,6 @@ Context::check_removal () } } -Context::Context (Context const & /* src */) -{ - assert (false); -} - Scheme_hash_table * Context::properties_dict () const { @@ -86,12 +80,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 +99,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 +148,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 = Context_def::unsmob (score_def)) + { + if (cd->is_alias (n)) + return create_context (cd, id, operations); + } + } + if (Context *existing = find_context_below (this, n, id)) return existing; @@ -215,22 +230,28 @@ IMPLEMENT_LISTENER (Context, acknowledge_infant); void Context::acknowledge_infant (SCM sev) { - infant_event_ = unsmob_stream_event (sev); + infant_event_ = Stream_event::unsmob (sev); } IMPLEMENT_LISTENER (Context, set_property_from_event); void Context::set_property_from_event (SCM sev) { - Stream_event *ev = unsmob_stream_event (sev); + Stream_event *ev = Stream_event::unsmob (sev); SCM sym = ev->get_property ("symbol"); 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); } @@ -240,7 +261,7 @@ IMPLEMENT_LISTENER (Context, unset_property_from_event); void Context::unset_property_from_event (SCM sev) { - Stream_event *ev = unsmob_stream_event (sev); + Stream_event *ev = Stream_event::unsmob (sev); SCM sym = ev->get_property ("symbol"); type_check_assignment (sym, SCM_EOL, ly_symbol2scm ("translation-type?")); @@ -255,7 +276,7 @@ IMPLEMENT_LISTENER (Context, create_context_from_event); void Context::create_context_from_event (SCM sev) { - Stream_event *ev = unsmob_stream_event (sev); + Stream_event *ev = Stream_event::unsmob (sev); string id = ly_scm2string (ev->get_property ("id")); SCM ops = ev->get_property ("ops"); @@ -301,7 +322,7 @@ Context::create_context_from_event (SCM sev) new_context->unprotect (); - Context_def *td = unsmob_context_def (new_context->definition_); + Context_def *td = Context_def::unsmob (new_context->definition_); /* This cannot move before add_context (), because \override operations require that we are in the hierarchy. */ @@ -326,7 +347,7 @@ Context::path_to_acceptable_context (SCM name) const accepts = scm_cons (elt, accepts); } - return unsmob_context_def (definition_)->path_to_acceptable_context (name, + return Context_def::unsmob (definition_)->path_to_acceptable_context (name, get_output_def (), scm_reverse_x (accepts, SCM_EOL)); @@ -334,7 +355,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; @@ -356,7 +377,7 @@ Context::create_context (Context_def *cdef, assert (infant_event_); SCM infant_scm = infant_event_->get_property ("context"); - Context *infant = unsmob_context (infant_scm); + Context *infant = Context::unsmob (infant_scm); if (!infant || infant->get_parent_context () != this) { @@ -374,9 +395,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 +405,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 ()) { @@ -394,15 +413,25 @@ Context::get_default_interpreter (string context_id) SCM st = find_context_def (get_output_def (), nm); string name = ly_symbol2string (nm); - Context_def *t = unsmob_context_def (st); + Context_def *t = Context_def::unsmob (st); if (!t) { warning (_f ("cannot find or create: `%s'", name.c_str ())); - t = unsmob_context_def (this->definition_); + t = Context_def::unsmob (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; } @@ -424,6 +453,19 @@ Context::where_defined (SCM sym, SCM *value) const return (daddy_context_) ? daddy_context_->where_defined (sym, value) : 0; } +/* Quick variant of where_defined. Checks only the context itself. */ + +bool +Context::here_defined (SCM sym, SCM *value) const +{ +#ifndef NDEBUG + if (profile_property_accesses) + note_property_access (&context_property_lookup_table, sym); +#endif + + return properties_dict ()->try_retrieve (sym, value); +} + /* return SCM_EOL when not found. */ @@ -453,7 +495,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 +509,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; @@ -512,8 +555,8 @@ IMPLEMENT_LISTENER (Context, change_parent); void Context::change_parent (SCM sev) { - Stream_event *ev = unsmob_stream_event (sev); - Context *to = unsmob_context (ev->get_property ("context")); + Stream_event *ev = Stream_event::unsmob (sev); + Context *to = Context::unsmob (ev->get_property ("context")); disconnect_from_parent (); to->add_context (this); @@ -546,7 +589,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)) { @@ -558,7 +601,7 @@ find_context_below (Context *where, for (SCM s = where->children_contexts (); !found && scm_is_pair (s); s = scm_cdr (s)) { - Context *tr = unsmob_context (scm_car (s)); + Context *tr = Context::unsmob (scm_car (s)); found = find_context_below (tr, type, id); } @@ -575,7 +618,7 @@ Context::properties_as_alist () const SCM Context::context_name_symbol () const { - Context_def *td = unsmob_context_def (definition_); + Context_def *td = Context_def::unsmob (definition_); return td->get_context_name (); } @@ -594,14 +637,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 { @@ -623,61 +658,54 @@ Context::now_mom () const } int -Context::print_smob (SCM s, SCM port, scm_print_state *) +Context::print_smob (SCM port, scm_print_state *) { - Context *sc = (Context *) SCM_CELL_WORD_1 (s); - scm_puts ("#<", port); - scm_puts (sc->class_name (), port); - if (Context_def *d = unsmob_context_def (sc->definition_)) + scm_puts (class_name (), port); + if (Context_def *d = Context_def::unsmob (definition_)) { scm_puts (" ", port); scm_display (d->get_context_name (), port); } - if (!sc->id_string_.empty ()) + if (!id_string_.empty ()) { scm_puts ("=", port); - scm_puts (sc->id_string_.c_str (), port); + scm_puts (id_string_.c_str (), port); } scm_puts (" ", port); - scm_display (sc->context_list_, port); + scm_display (context_list_, port); scm_puts (" >", port); return 1; } SCM -Context::mark_smob (SCM sm) +Context::mark_smob () { - Context *me = (Context *) SCM_CELL_WORD_1 (sm); - - scm_gc_mark (me->context_list_); - scm_gc_mark (me->aliases_); - scm_gc_mark (me->definition_); - scm_gc_mark (me->definition_mods_); - scm_gc_mark (me->properties_scm_); - scm_gc_mark (me->accepts_list_); - - if (me->implementation_) - scm_gc_mark (me->implementation_->self_scm ()); + scm_gc_mark (context_list_); + scm_gc_mark (aliases_); + scm_gc_mark (definition_); + scm_gc_mark (definition_mods_); + scm_gc_mark (properties_scm_); + scm_gc_mark (accepts_list_); + scm_gc_mark (default_child_); - if (me->event_source_) - scm_gc_mark (me->event_source_->self_scm ()); + if (implementation_) + scm_gc_mark (implementation_->self_scm ()); - if (me->events_below_) - scm_gc_mark (me->events_below_->self_scm ()); + if (event_source_) + scm_gc_mark (event_source_->self_scm ()); - scm_gc_mark (me->ancestor_lookup_); + if (events_below_) + scm_gc_mark (events_below_->self_scm ()); - return me->properties_scm_; + return properties_scm_; } -IMPLEMENT_SMOBS (Context); -IMPLEMENT_DEFAULT_EQUAL_P (Context); -IMPLEMENT_TYPE_P (Context, "ly:context?"); +const char Context::type_p_name_[] = "ly:context?"; Global_context * Context::get_global_context () const @@ -706,8 +734,8 @@ measure_length (Context const *context) { SCM l = context->get_property ("measureLength"); Rational length (1); - if (unsmob_moment (l)) - length = unsmob_moment (l)->main_part_; + if (Moment::is_smob (l)) + length = Moment::unsmob (l)->main_part_; return length; } @@ -717,9 +745,9 @@ measure_position (Context const *context) SCM sm = context->get_property ("measurePosition"); Moment m = 0; - if (unsmob_moment (sm)) + if (Moment::is_smob (sm)) { - m = *unsmob_moment (sm); + m = *Moment::unsmob (sm); if (m.main_part_ < Rational (0)) { @@ -767,7 +795,7 @@ set_context_property_on_children (Context *trans, SCM sym, SCM val) trans->set_property (sym, ly_deep_copy (val)); for (SCM p = trans->children_contexts (); scm_is_pair (p); p = scm_cdr (p)) { - Context *trg = unsmob_context (scm_car (p)); + Context *trg = Context::unsmob (scm_car (p)); set_context_property_on_children (trg, sym, ly_deep_copy (val)); } } @@ -775,14 +803,29 @@ set_context_property_on_children (Context *trans, SCM sym, SCM val) bool melisma_busy (Context *tr) { - SCM melisma_properties = tr->get_property ("melismaBusyProperties"); - bool busy = false; + // When there are subcontexts, they are responsible for maintaining + // melismata. + SCM ch = tr->children_contexts (); + if (scm_is_pair (ch)) + { + // all contexts need to have a busy melisma for this to evaluate + // to true. + + do { + if (!melisma_busy (Context::unsmob (scm_car (ch)))) + return false; + ch = scm_cdr (ch); + } while (scm_is_pair (ch)); + return true; + } - for (; !busy && scm_is_pair (melisma_properties); + for (SCM melisma_properties = tr->get_property ("melismaBusyProperties"); + scm_is_pair (melisma_properties); melisma_properties = scm_cdr (melisma_properties)) - busy = busy || to_boolean (tr->internal_get_property (scm_car (melisma_properties))); + if (to_boolean (tr->get_property (scm_car (melisma_properties)))) + return true; - return busy; + return false; } bool