source file of the GNU LilyPond music typesetter
- (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ (c) 1999--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
#ifndef LY_SMOBS_ICC
ADD_SCM_INIT_FUNC (init_type_ ## CL, init_type_ ## CL)
#define IMPLEMENT_BASE_SMOBS(CL) \
+ void \
+ CL ## _type_adder () \
+ {\
+ ly_add_type_predicate ((void*) &CL::unsmob, #CL); \
+ }\
+ ADD_SCM_INIT_FUNC(CL ## _type_adder_ctor, \
+ CL ## _type_adder);\
+ const char *CL::smob_name_ = #CL; \
scm_t_bits CL::smob_tag_; \
SCM \
CL::smob_p (SCM s) \
CL *ptr = new CL (*this); \
SCM s; \
s = scm_cons (SCM_PACK (CL::smob_tag_), SCM_PACK (ptr)); \
- /* scm_gc_register_collectable_memory ((CL *)this, sizeof (CL), #CL " smob");*/ \
+ scm_gc_register_collectable_memory ((CL *)this, sizeof (CL), #CL " smob"); \
\
return s; \
}
#define IMPLEMENT_SMOBS(CL) \
IMPLEMENT_BASE_SMOBS (CL) \
- void \
+ void \
CL::smobify_self () \
{ \
+ protection_cons_ = SCM_EOL; \
self_scm_ = unprotected_smobify_self (); \
- protection_cons_ = SCM_EOL;\
- protect();\
- }\
- void\
- CL::protect(){ \
- protect_smob (self_scm_, &protection_cons_);\
- }\
- SCM\
- CL::unprotect ()\
- {\
- unprotect_smob (&protection_cons_);\
- return self_scm_;\
+ protect (); \
+ } \
+ void \
+ CL::protect () \
+ { \
+ protect_smob (self_scm_, &protection_cons_); \
+ } \
+ SCM \
+ CL::unprotect () \
+ { \
+ unprotect_smob (self_scm_, &protection_cons_); \
+ return self_scm_; \
} \
SCM \
CL::unprotected_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 \
+ 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_NEWSMOB (s, CL::smob_tag_, this); \
self_scm_ = s; \
- /* scm_gc_register_collectable_memory (this, sizeof (CL), #CL " smob");*/ \
+ scm_gc_register_collectable_memory (this, sizeof (CL), #CL " smob"); \
return s; \
}