From 358e9835481edc7b118015fe73cf9e6b6103e63a Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Mon, 12 Apr 2004 14:38:33 +0000 Subject: [PATCH] * lily/include/context.hh (class Context): make members protected. (children_contexts): new accessor function. * lily/include/context.hh (class Context): make daddy_context_ private. * lily/include/context.hh (class Context): remove find_context_below() as a method. --- lily/include/context.hh | 28 ++++++++++++++++------------ lily/translator-group.cc | 4 +--- lily/translator.cc | 4 +--- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/lily/include/context.hh b/lily/include/context.hh index 75c7e65ac6..f32e3e8378 100644 --- a/lily/include/context.hh +++ b/lily/include/context.hh @@ -40,40 +40,44 @@ protected: public: SCM children_contexts () const { return context_list_; } SCM default_child_context_name () const; + Translator_group* implementation () const; - Context * get_parent_context () const; - Context (); + + /* + properties: + */ void execute_pushpop_property (SCM prop, SCM sym, SCM val); SCM internal_get_property (SCM name_sym) const; - - Context *remove_context (Context*trans); - void check_removal (); - SCM properties_as_alist () const; - void unset_property (SCM var_sym); void internal_set_property (SCM var_sym, SCM value); - Context *where_defined (SCM name_sym) const; + void unset_property (SCM var_sym); + + + Context *remove_context (Context*trans); + void check_removal (); String context_name () const; Global_context * get_global_context () const; virtual Score_context * get_score_context () const; + virtual Music_output_def *get_output_def () const; + virtual Moment now_mom () const; + virtual Context *get_default_interpreter (); + bool is_alias (SCM) const; void add_alias (SCM); void add_context (Context *trans); bool is_bottom_context () const; bool is_removable () const; bool try_music (Music *); - - virtual Music_output_def *get_output_def () const; - virtual Moment now_mom () const; + Context *find_create_context (SCM context_name, String id, SCM ops); Link_array path_to_acceptable_context (SCM alias, Music_output_def*) const; - virtual Context *get_default_interpreter (); + String id_string_; }; diff --git a/lily/translator-group.cc b/lily/translator-group.cc index d2514ccc8d..9948739c26 100644 --- a/lily/translator-group.cc +++ b/lily/translator-group.cc @@ -20,9 +20,7 @@ Translator_group* Translator_group::get_daddy_translator () const { - Translator *t - = unsmob_translator (get_parent_context ()->get_parent_context ()->implementation_); - return dynamic_cast (t); + return get_parent_context ()->get_parent_context ()->implementation (); } diff --git a/lily/translator.cc b/lily/translator.cc index d8211a24c1..62846fb3cd 100644 --- a/lily/translator.cc +++ b/lily/translator.cc @@ -74,9 +74,7 @@ Translator::get_output_def () const Translator_group* Translator::get_daddy_translator () const { - Translator *t - = unsmob_translator (daddy_context_->implementation_); - return dynamic_cast (t); + return daddy_context_->implementation (); } -- 2.39.2