]> git.donarmstrong.com Git - lilypond.git/blobdiff - lily/include/ly-smobs.icc
* lily/include/lily-guile.hh: Remove guile-1.4 compatibility.
[lilypond.git] / lily / include / ly-smobs.icc
index a2e418a4c4a1b037dd540d222fcd3ff16f0389b2..8fd9ff7aaeaad2b891652ee6aa0666a9424553cf 100644 (file)
@@ -1,10 +1,9 @@
-/*   
-  ly-smobs.icc -- implement smob glue. 
-  
+/*
+  ly-smobs.icc -- implement smob glue.
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
+
+  (c)  1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
  */
 
 #ifndef LY_SMOBS_ICC
 
 #include "smobs.hh"
 
-
-#define IMPLEMENT_TYPE_P(CL, FUNCNAME)\
-void init_type_p_ ## CL ()\
-{\
-  scm_c_define_gsubr (FUNCNAME, 1, 0, 0, (Scheme_function_unknown) CL::smob_p);\
-  ly_add_function_documentation (FUNCNAME, "(SCM x)", "Check if @var{x} is a " #CL " object");\
-}\
-ADD_SCM_INIT_FUNC (init_type_p_ ## CL, init_type_p_ ## CL)
+#define IMPLEMENT_TYPE_P(CL, FUNCNAME) \
+SCM CL ## _type_p_proc; \
+void init_type_ ## CL () \
+{ \
+  SCM subr = scm_c_define_gsubr (FUNCNAME, 1, 0, 0, \
+                                (Scheme_function_unknown) CL::smob_p); \
+  CL ## _type_p_proc = subr; \
+  ly_add_function_documentation (subr, FUNCNAME, "(SCM x)", \
+                                "Is @var{x} a @code{" #CL "} object?"); \
+  scm_c_export (FUNCNAME, NULL); \
+} \
+ADD_SCM_INIT_FUNC (init_type_ ## CL, init_type_ ## CL)
 
 #ifndef SCM_CELL_TYPE
 #define SCM_CELL_TYPE(X) SCM_CAR (X)
@@ -29,79 +32,85 @@ ADD_SCM_INIT_FUNC (init_type_p_ ## CL, init_type_p_ ## CL)
 #define SCM_CELL_WORD_1(X) SCM_CDR (X)
 #endif
 
+#define IMPLEMENT_BASE_SMOBS(CL) \
+scm_t_bits CL::smob_tag_; \
+SCM \
+CL::smob_p (SCM s) \
+{ \
+  if (SCM_NIMP (s) && SCM_CELL_TYPE (s) == smob_tag_) \
+    return SCM_BOOL_T; \
+  else \
+    return SCM_BOOL_F; \
+ \
+} \
+  \
+void \
+CL::init_smobs () \
+{ \
+  smob_tag_ = scm_make_smob_type (#CL, 0); \
+  scm_set_smob_mark (smob_tag_, CL::mark_smob); \
+  scm_set_smob_free (smob_tag_, CL::free_smob); \
+  scm_set_smob_print (smob_tag_, CL::print_smob); \
+  scm_set_smob_equalp (smob_tag_, CL::equal_p); \
+} \
+  \
+size_t \
+CL::free_smob (SCM ses) \
+{ \
+  CL *s = (CL*) SCM_CDR (ses); \
+  delete s; \
+  scm_gc_unregister_collectable_memory (s, sizeof (CL), #CL " smob"); \
+  return SMOB_FREE_RETURN_VAL(CL); \
+} \
+  \
+ADD_SCM_INIT_FUNC (CL, CL::init_smobs)
 
+#define IMPLEMENT_SIMPLE_SMOBS(CL) \
+IMPLEMENT_BASE_SMOBS(CL); \
+SCM CL::smobbed_copy () const \
+{ \
+  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"); \
+ \
+  return s; \
+} \
 
-#define IMPLEMENT_SIMPLE_SMOBS(CL)                             \
-scm_t_bits CL::smob_tag_;                                       \
-SCM                                                            \
-CL::smob_p (SCM s)                                             \
-{                                                              \
-  if (SCM_NIMP (s) && SCM_CELL_TYPE (s) == smob_tag_)          \
-    return SCM_BOOL_T;                                         \
-  else                                                         \
-    return SCM_BOOL_F;                                         \
-                                                               \
-}                                                              \
-void                                                           \
-CL::init_smobs ()                                              \
-{                                                              \
-  smob_tag_ = scm_make_smob_type (#CL, 0);                      \
-  scm_set_smob_mark (smob_tag_, CL::mark_smob);                 \
-  scm_set_smob_free (smob_tag_, CL::free_smob);                 \
-  scm_set_smob_print (smob_tag_, CL::print_smob);               \
-  scm_set_smob_equalp (smob_tag_, CL::equal_p);                 \
-}                                                              \
-SCM CL::smobbed_self () const                                  \
-{                                                              \
-  SCM s;                                                       \
-  s = gh_cons (SCM_PACK (CL::smob_tag_), SCM_PACK (this));     \
-  scm_gc_register_collectable_memory ((CL*)this, sizeof (CL), #CL " smob");                            \
-                                                               \
-  return s;                                                    \
-}                                                              \
-size_t                                                         \
-CL::free_smob (SCM ses)                                                \
-{                                                              \
-  CL * s = (CL*) SCM_CDR (ses);                                        \
-  delete s;                                                    \
-  scm_gc_unregister_collectable_memory (s, sizeof (CL), #CL " smob");  \
-  return SMOB_FREE_RETURN_VAL(CL);\
-}\
-ADD_SCM_INIT_FUNC (CL, CL::init_smobs)
 
-#define IMPLEMENT_SMOBS(CL)                                                    \
-IMPLEMENT_SIMPLE_SMOBS (CL)                                                    \
-SCM                                                                            \
-CL::smobify_self ()                                                            \
-{                                                                              \
-  SCM s =   unprotected_smobify_self ();\
-  scm_gc_protect_object (s);\
-  return s;\
-}\
-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               \
-   */                                                                          \
-  SCM s;\
-  SCM_NEWSMOB (s, CL::smob_tag_, this);\
-  self_scm_ = s;                                                               \
- scm_gc_register_collectable_memory (this, sizeof (CL), #CL " smob");                                                  \
-  return s;                                                                    \
+#define IMPLEMENT_SMOBS(CL) \
+IMPLEMENT_BASE_SMOBS (CL) \
+void \
+CL::smobify_self () \
+{ \
+  SCM s = unprotected_smobify_self (); \
+  scm_gc_protect_object (s); \
+\
+  \
+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 \
+   */ \
+  SCM s; \
+  SCM_NEWSMOB (s, CL::smob_tag_, this); \
+  self_scm_ = s; \
+ scm_gc_register_collectable_memory (this, sizeof (CL), #CL " smob"); \
+  return s; \
 }
 
-#define IMPLEMENT_DEFAULT_EQUAL_P(CL)          \
-SCM                                            \
-CL::equal_p (SCM a , SCM b)                    \
-{                                              \
-  return a == b ? SCM_BOOL_T : SCM_BOOL_F;     \
-}
+#define IMPLEMENT_DEFAULT_EQUAL_P(CL) \
+SCM \
+CL::equal_p (SCM a , SCM b) \
+{ \
+  return a == b ? SCM_BOOL_T : SCM_BOOL_F; \
+} \
 
 
 #endif /* LY_SMOBS_ICC */