From a3a6f7c5306539b131eaed9ebc9c2deb218cbc3a Mon Sep 17 00:00:00 2001 From: fred Date: Tue, 26 Mar 2002 23:25:16 +0000 Subject: [PATCH] lilypond-1.3.74 --- lily/include/ly-smobs.icc | 146 +++++++++++++++++++------------------- lily/score-element.cc | 41 ++++------- 2 files changed, 85 insertions(+), 102 deletions(-) diff --git a/lily/include/ly-smobs.icc b/lily/include/ly-smobs.icc index 8a8648e6a5..b17bd314f1 100644 --- a/lily/include/ly-smobs.icc +++ b/lily/include/ly-smobs.icc @@ -17,83 +17,83 @@ CL * \ unsmob_ ## name ( SCM s) \ { \ - if (SMOB_IS_TYPE_B(CL, s)) \ - return SMOB_TO_TYPE(CL, s); \ - else \ - return 0; \ -}\ -SCM smobify (CL *cl)\ -{\ - SCM s; \ - \ - SCM_NEWCELL(s); \ - SCM_SETCAR(s,CL::smob_tag_); \ - SCM me_s = SCM_PACK(cl); \ - SCM_SETCDR (s, me_s); \ -return s;\ -}\ +return CL::unsmob (s); \ +} -/* - should include equal_p ? - */ -#define IMPLEMENT_SMOBS(CL)\ -long CL::smob_tag_;\ -void \ -CL::init_smobs () \ -{ \ - smob_tag_ = scm_make_smob_type_mfpe ( \ - #CL, 0, CL::mark_smob, CL::free_smob, CL::print_smob, 0);\ -}\ - \ - \ -void \ -CL::unsmobify_self () \ -{ \ - SCM s = self_scm_; \ - scm_unprotect_object (s); \ - \ - SCM_SETCAR (self_scm_, SCM_EOL); \ - SCM_SETCDR (self_scm_, SCM_EOL); \ - self_scm_ = SCM_EOL; \ -\ - scm_done_malloc ( - sizeof (CL));\ -} \ -\ -SCM \ -CL::smobify_self () \ -{ \ - if (self_scm_ != SCM_EOL) \ - return self_scm_; \ - \ - /* \ - This is local. We don't assign to self_scm_ directly, to assure \ - that S isn't GC-ed from under us. \ - */ \ - SCM s = smobify (this); \ - self_scm_ = s; \ - scm_protect_object (s); \ - \ - scm_done_malloc(sizeof(CL));\ - do_smobify_self(); \ - return s; \ -} \ -scm_sizet \ -CL::free_smob (SCM ses) \ +#ifndef SCM_CELL_TYPE +#define SCM_CELL_TYPE(X) SCM_CAR(X) +#endif + +#ifndef SCM_CELL_WORD_1 +#define SCM_CELL_WORD_1(X) SCM_CDR(X) +#endif + + +#define IMPLEMENT_SIMPLE_SMOBS(CL) \ +long CL::smob_tag_; \ +void \ +CL::init_smobs () \ +{ \ + smob_tag_ = scm_make_smob_type_mfpe ( \ + #CL, 0, CL::mark_smob, CL::free_smob, CL::print_smob, 0); \ +} \ +SCM CL::smobbed_self () const \ +{ \ + SCM s; \ + s = gh_cons (SCM_PACK(CL::smob_tag_), SCM_PACK(this)); \ + scm_done_malloc(sizeof(CL)); \ + \ + return s; \ +} \ +CL * \ +CL::unsmob (SCM s) \ +{ \ + if (SCM_NIMP(s) && SCM_CELL_TYPE(s) == smob_tag_) \ + return (CL*) SCM_CELL_WORD_1(s); \ + else \ + return 0; \ +} \ +scm_sizet \ +CL::free_smob (SCM ses) \ +{ \ + CL * s = (CL*) SCM_CDR(ses); \ + delete s; \ + return sizeof (CL); \ +} \ +ADD_SCM_INIT_FUNC(CL, CL::init_smobs) + +#define IMPLEMENT_SMOBS(CL) \ +IMPLEMENT_SIMPLE_SMOBS(CL) \ +SCM \ +CL::smobify_self () \ +{ \ + /* \ + This is local. We don't assign to self_scm_ directly, to assure \ + that S isn't GC-ed from under us. \ + \ + We don't use smobbed_self () to ensure that mark_smob () doesn't have to \ + deal half-initialized objects: scm_done_malloc( ) might trigger GC. \ + the warning in smobs.hh is just to be doubleplus goodly sure \ + */ \ + SCM s; \ + SCM_NEWCELL(s); \ + SCM_SETCAR(s,CL::smob_tag_); \ + SCM_SETCDR (s, SCM_PACK(this)); \ + self_scm_ = s; \ + scm_done_malloc(sizeof(CL)); \ + scm_protect_object (s); \ + return s; \ +} + +#define IMPLEMENT_DEFAULT_EQUAL_P(CL) \ +SCM \ +CL::equal_p (SCM a , SCM b) \ { \ - CL * s = (CL*) SCM_CDR(ses); \ - /* someone else did the deed already; this might be an automatic var.*/ \ - if (s->self_scm_ != ses)\ - return 0; \ -\ - /* no need to call scm_unprotect_object, since this call \ - implies that the object is not protected. */ \ - SCM_SETCAR (ses, SCM_EOL); \ - delete s;\ - return sizeof (CL);\ -} \ -ADD_SCM_INIT_FUNC(CL, CL::init_smobs)\ + return a == b ? SCM_BOOL_T : SCM_BOOL_F; \ +} #endif /* LY_SMOBS_ICC */ + diff --git a/lily/score-element.cc b/lily/score-element.cc index 451c1f40be..e1c218d1bf 100644 --- a/lily/score-element.cc +++ b/lily/score-element.cc @@ -49,7 +49,6 @@ Score_element::Score_element(SCM basicprops) pscore_l_=0; lookup_l_ =0; status_i_ = 0; - self_scm_ = SCM_EOL; original_l_ = 0; immutable_property_alist_ = basicprops; mutable_property_alist_ = SCM_EOL; @@ -65,7 +64,6 @@ Score_element::Score_element(SCM basicprops) Score_element::Score_element (Score_element const&s) : dim_cache_ (s.dim_cache_) { - self_scm_ = SCM_EOL; original_l_ =(Score_element*) &s; immutable_property_alist_ = s.immutable_property_alist_; mutable_property_alist_ = SCM_EOL; @@ -236,7 +234,7 @@ Score_element::calculate_dependencies (int final, int busy, SCM funcname) String s = ly_symbol2string (funcname); SCM proc = get_elt_property (s.ch_C()); if (gh_procedure_p (proc)) - gh_call1 (proc, this->self_scm_); + gh_call1 (proc, this->self_scm ()); status_i_= final; @@ -249,7 +247,7 @@ Score_element::get_molecule () const SCM mol = SCM_EOL; if (gh_procedure_p (proc)) - mol = gh_apply (proc, gh_list (this->self_scm_, SCM_UNDEFINED)); + mol = gh_apply (proc, gh_list (this->self_scm (), SCM_UNDEFINED)); SCM origin =get_elt_property ("origin"); @@ -345,7 +343,7 @@ Score_element::handle_broken_smobs (SCM src, SCM criterion) if (i && i->break_status_dir () != d) { Item *br = i->find_prebroken_piece (d); - return (br) ? br->self_scm_ : SCM_UNDEFINED; + return (br) ? br->self_scm () : SCM_UNDEFINED; } } else @@ -367,7 +365,7 @@ Score_element::handle_broken_smobs (SCM src, SCM criterion) || (sc->common_refpoint (line, X_AXIS) && sc->common_refpoint (line, Y_AXIS))) { - return sc->self_scm_; + return sc->self_scm (); } return SCM_UNDEFINED; } @@ -419,7 +417,7 @@ Score_element::handle_broken_dependencies() Line_of_score * l = sc->line_l (); sc->mutable_property_alist_ = handle_broken_smobs (mutable_property_alist_, - l ? l->self_scm_ : SCM_UNDEFINED); + l ? l->self_scm () : SCM_UNDEFINED); } } @@ -430,7 +428,7 @@ Score_element::handle_broken_dependencies() { mutable_property_alist_ = handle_broken_smobs (mutable_property_alist_, - line ? line->self_scm_ : SCM_UNDEFINED); + line ? line->self_scm () : SCM_UNDEFINED); } else if (dynamic_cast (this)) { @@ -712,26 +710,22 @@ Score_element::fixup_refpoint (SCM smob) IMPLEMENT_UNSMOB(Score_element, element); IMPLEMENT_SMOBS(Score_element); +IMPLEMENT_DEFAULT_EQUAL_P(Score_element); SCM Score_element::mark_smob (SCM ses) { - Score_element * s = SMOB_TO_TYPE (Score_element, ses); - if (s->self_scm_ != ses) - { - programming_error ("SMOB marking gone awry"); - return SCM_EOL; - } + Score_element * s = (Score_element*) SCM_CELL_WORD_1(ses); scm_gc_mark (s->immutable_property_alist_); scm_gc_mark (s->mutable_property_alist_); if (s->parent_l (Y_AXIS)) - scm_gc_mark (s->parent_l (Y_AXIS)->self_scm_); + scm_gc_mark (s->parent_l (Y_AXIS)->self_scm ()); if (s->parent_l (X_AXIS)) - scm_gc_mark (s->parent_l (X_AXIS)->self_scm_); + scm_gc_mark (s->parent_l (X_AXIS)->self_scm ()); if (s->original_l_) - scm_gc_mark (s->original_l_->self_scm_); + scm_gc_mark (s->original_l_->self_scm ()); return s->do_derived_mark (); } @@ -756,17 +750,6 @@ Score_element::do_derived_mark () return SCM_EOL; } -void -Score_element::do_smobify_self () -{ -} - -SCM -Score_element::equal_p (SCM a, SCM b) -{ - return gh_cdr(a) == gh_cdr(b) ? SCM_BOOL_T : SCM_BOOL_F; -} - SCM ly_set_elt_property (SCM elt, SCM sym, SCM val) @@ -822,7 +805,7 @@ Score_element::discretionary_processing() SCM spanner_get_bound (SCM slur, SCM dir) { - return dynamic_cast (unsmob_element (slur))->get_bound (to_dir (dir))->self_scm_; + return dynamic_cast (unsmob_element (slur))->get_bound (to_dir (dir))->self_scm (); } -- 2.39.5