source file of the GNU LilyPond music typesetter
- (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
-
+ (c) 2005--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
*/
-
#include "grob.hh"
#include "paper-score.hh"
+#include "warn.hh"
#include "ly-smobs.icc"
IMPLEMENT_SMOBS (Grob);
IMPLEMENT_DEFAULT_EQUAL_P (Grob);
+IMPLEMENT_TYPE_P (Grob, "ly:grob?");
SCM
Grob::mark_smob (SCM ses)
{
+ ASSERT_LIVE_IS_ALLOWED ();
+
Grob *s = (Grob *) SCM_CELL_WORD_1 (ses);
scm_gc_mark (s->immutable_property_alist_);
- if (s->key_)
- scm_gc_mark (s->key_->self_scm ());
- for (int a = 0; a < 2; a++)
- {
- scm_gc_mark (s->dim_cache_[a].offset_callbacks_);
- scm_gc_mark (s->dim_cache_[a].dimension_);
- scm_gc_mark (s->dim_cache_[a].dimension_callback_);
-
- /* Do not mark the parents. The pointers in the mutable
- property list form two tree like structures (one for X
- relations, one for Y relations). Marking these can be done
- in limited stack space. If we add the parents, we will jump
- between X and Y in an erratic manner, leading to much more
- recursion depth (and core dumps if we link to pthreads). */
- }
-
- if (s->original_)
- scm_gc_mark (s->original_->self_scm ());
+ /* Do not mark the parents. The pointers in the mutable
+ property list form two tree like structures (one for X
+ relations, one for Y relations). Marking these can be done
+ in limited stack space. If we add the parents, we will jump
+ between X and Y in an erratic manner, leading to much more
+ recursion depth (and core dumps if we link to pthreads). */
- if (s->pscore_)
- scm_gc_mark (s->pscore_->self_scm ());
+ if (s->original ())
+ scm_gc_mark (s->original ()->self_scm ());
- s->do_derived_mark ();
+ s->derived_mark ();
scm_gc_mark (s->object_alist_);
scm_gc_mark (s->interfaces_);
Grob *sc = (Grob *) SCM_CELL_WORD_1 (s);
scm_puts ("#<Grob ", port);
- scm_puts ((char *) sc->name ().to_str0 (), port);
+ scm_puts ((char *) sc->name ().c_str (), port);
/* Do not print properties, that is too much hassle. */
scm_puts (" >", port);
return 1;
}
-SCM
-Grob::do_derived_mark () const
+void
+Grob::derived_mark () const
{
- return SCM_EOL;
}
-
-IMPLEMENT_TYPE_P (Grob, "ly:grob?");
-