X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgrob-smob.cc;h=72949973b1acf777fb88295945c7cf44e7f6e489;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=e7800e96e25864486f94336bb8b053bc8f4e253d;hpb=f2c2c5c43858f323e4708f83fd97e0f38017c275;p=lilypond.git

diff --git a/lily/grob-smob.cc b/lily/grob-smob.cc
index e7800e96e2..72949973b1 100644
--- a/lily/grob-smob.cc
+++ b/lily/grob-smob.cc
@@ -1,62 +1,59 @@
 /*
-  grob-smob.cc -- implement GROB smob routines.
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2005--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2005 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
 
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
-   
 
 #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?");
+const char * const Grob::type_p_name_ = "ly:grob?";
 
 SCM
-Grob::mark_smob (SCM ses)
+Grob::mark_smob () const
 {
-  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 ());
-
-  s->derived_mark ();
-  scm_gc_mark (s->object_alist_);
-  scm_gc_mark (s->interfaces_);
-
-  return s->mutable_property_alist_;
+  ASSERT_LIVE_IS_ALLOWED (self_scm ());
+
+  scm_gc_mark (immutable_property_alist_);
+
+  /* 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 (original ())
+    scm_gc_mark (original ()->self_scm ());
+
+  derived_mark ();
+  scm_gc_mark (object_alist_);
+  scm_gc_mark (interfaces_);
+
+  return mutable_property_alist_;
 }
 
 int
-Grob::print_smob (SCM s, SCM port, scm_print_state *)
+Grob::print_smob (SCM port, scm_print_state *) const
 {
-  Grob *sc = (Grob *) SCM_CELL_WORD_1 (s);
-
   scm_puts ("#<Grob ", port);
-  scm_puts ((char *) sc->name ().to_str0 (), port);
+  scm_puts ((char *) name ().c_str (), port);
 
   /* Do not print properties, that is too much hassle.  */
   scm_puts (" >", port);