X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fprob.cc;h=52ce8b682168de233e545bac6363209941f443a7;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=e0bc2a7109bba631e3ffb1658f79f3bf6cb94030;hpb=bc95f4434f760d41191341ab4508b2064eb19025;p=lilypond.git

diff --git a/lily/prob.cc b/lily/prob.cc
index e0bc2a7109..52ce8b6821 100644
--- a/lily/prob.cc
+++ b/lily/prob.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2004--2010 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 2004--2015 Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -23,10 +23,8 @@
 #include "input.hh"
 #include "profile.hh"
 
-#include "ly-smobs.icc"
 
-IMPLEMENT_SMOBS (Prob);
-IMPLEMENT_TYPE_P (Prob, "ly:prob?");
+const char Prob::type_p_name_[] = "ly:prob?";
 
 SCM
 Prob::equal_p (SCM sa, SCM sb)
@@ -35,10 +33,10 @@ Prob::equal_p (SCM sa, SCM sb)
      constructor preserve equality.
 
      Perhaps it would be better to use a more strict definition of
-     equality; e.g., that that two probs are equal iff they can be
+     equality; e.g., that two probs are equal iff they can be
      distinguished by calls to ly:prob-property.
   */
-  Prob *probs[2] = {unsmob_prob (sa), unsmob_prob (sb)};
+  Prob *probs[2] = {Prob::unsmob (sa), Prob::unsmob (sb)};
   SCM props[2][2];
   int i;
 
@@ -58,46 +56,43 @@ Prob::equal_p (SCM sa, SCM sb)
       SCM bprop = props[1][i];
 
       for (;
-	   scm_is_pair (aprop) && scm_is_pair (bprop);
-	   aprop = scm_cdr (aprop), bprop = scm_cdr (bprop))
-	{
-	  SCM aval = scm_cdar (aprop);
-	  SCM bval = scm_cdar (bprop);
-	  if (scm_caar (aprop) != scm_caar (bprop) ||
-	      (
-	       !(unsmob_input (aval) && unsmob_input (bval))
-	       &&		 
-	       !to_boolean (scm_equal_p (aval, bval))))
-	    return SCM_BOOL_F;
-	}
+           scm_is_pair (aprop) && scm_is_pair (bprop);
+           aprop = scm_cdr (aprop), bprop = scm_cdr (bprop))
+        {
+          SCM aval = scm_cdar (aprop);
+          SCM bval = scm_cdar (bprop);
+          if (scm_caar (aprop) != scm_caar (bprop)
+              || (!(Input::is_smob (aval) && Input::is_smob (bval))
+                  &&
+                  !to_boolean (scm_equal_p (aval, bval))))
+            return SCM_BOOL_F;
+        }
 
       /* is one list shorter? */
       if (aprop != SCM_EOL || bprop != SCM_EOL)
-	return SCM_BOOL_F;
+        return SCM_BOOL_F;
     }
 
   return SCM_BOOL_T;
 }
 
-Prob::Prob (SCM type, SCM immutable_init)
+Prob::Prob (SCM type, SCM immutable_init) : Smob<Prob> ()
 {
-  self_scm_ = SCM_EOL;
   mutable_property_alist_ = SCM_EOL;
   immutable_property_alist_ = immutable_init;
   type_ = type;
   smobify_self ();
 }
 
-
 Prob::~Prob ()
 {
 }
 
 Prob::Prob (Prob const &src)
+  : Smob<Prob> ()
 {
   immutable_property_alist_ = src.immutable_property_alist_;
   mutable_property_alist_ = SCM_EOL;
-  self_scm_ = SCM_EOL;
   type_ = src.type_;
 
   /* First we smobify_self, then we copy over the stuff.  If we don't,
@@ -107,7 +102,6 @@ Prob::Prob (Prob const &src)
   mutable_property_alist_ = src.copy_mutable_properties ();
 }
 
-
 SCM
 Prob::copy_mutable_properties () const
 {
@@ -120,35 +114,31 @@ Prob::derived_mark () const
 }
 
 SCM
-Prob::mark_smob (SCM smob)
+Prob::mark_smob ()
 {
-  ASSERT_LIVE_IS_ALLOWED ();
-  
-  Prob *system = (Prob *) SCM_CELL_WORD_1 (smob);
-  scm_gc_mark (system->mutable_property_alist_);
-  system->derived_mark ();
-  
-  return system->immutable_property_alist_;
+  ASSERT_LIVE_IS_ALLOWED (self_scm ());
+
+  scm_gc_mark (mutable_property_alist_);
+  derived_mark ();
+
+  return immutable_property_alist_;
 }
 
 int
-Prob::print_smob (SCM smob, SCM port, scm_print_state*)
+Prob::print_smob (SCM port, scm_print_state *)
 {
-  Prob *p = (Prob *) SCM_CELL_WORD_1 (smob);
   scm_puts ("#<", port);
   scm_puts ("Prob: ", port);
-  scm_display (p->type_, port);
+  scm_display (type_, port);
   scm_puts (" C++: ", port);
-  scm_puts (p->class_name (), port);
-  scm_display (p->mutable_property_alist_, port);
-  scm_display (p->immutable_property_alist_, port);
-  
+  scm_puts (class_name (), port);
+  scm_display (mutable_property_alist_, port);
+  scm_display (immutable_property_alist_, port);
+
   scm_puts (" >\n", port);
   return 1;
 }
 
-
-
 SCM
 Prob::internal_get_property (SCM sym) const
 {
@@ -170,17 +160,17 @@ Prob::internal_get_property (SCM sym) const
 
 /* We don't (yet) instrument probs */
 void
-Prob::instrumented_set_property (SCM sym, SCM val, const char*, int, const char*)
+Prob::instrumented_set_property (SCM sym, SCM val, const char *, int, const char *)
 {
   internal_set_property (sym, val);
 }
 
 void
-Prob::internal_set_property (SCM sym, SCM val) 
+Prob::internal_set_property (SCM sym, SCM val)
 {
   if (do_internal_type_checking_global)
     type_check_assignment (sym, val);
-  
+
   mutable_property_alist_ = scm_assq_set_x (mutable_property_alist_, sym, val);
 }
 
@@ -205,4 +195,3 @@ Prob::name () const
   else
     return this->class_name ();
 }
-