X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fprob.cc;h=d05a33e4f3aa60387ad40a612deaf01a6d952a54;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=60ed8915eb08c619488d498dcbb0f82939e65e78;hpb=82bc9ad690e201aaa55694f8b92261ae7338f56a;p=lilypond.git

diff --git a/lily/prob.cc b/lily/prob.cc
index 60ed8915eb..d05a33e4f3 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--2014 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 * const Prob::type_p_name_ = "ly:prob?";
 
 SCM
 Prob::equal_p (SCM sa, SCM sb)
@@ -38,7 +36,7 @@ Prob::equal_p (SCM sa, SCM sb)
      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] = {unsmob<Prob> (sa), unsmob<Prob> (sb)};
   SCM props[2][2];
   int i;
 
@@ -63,24 +61,22 @@ Prob::equal_p (SCM sa, SCM sb)
         {
           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))))
+          if (!scm_is_eq (scm_caar (aprop), scm_caar (bprop))
+              || (!(unsmob<Input> (aval) && unsmob<Input> (bval))
+                  && !ly_is_equal (aval, bval)))
             return SCM_BOOL_F;
         }
 
       /* is one list shorter? */
-      if (aprop != SCM_EOL || bprop != SCM_EOL)
+      if (!scm_is_null (aprop) || !scm_is_null (bprop))
         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;
@@ -92,10 +88,10 @@ 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,
@@ -117,28 +113,26 @@ Prob::derived_mark () const
 }
 
 SCM
-Prob::mark_smob (SCM smob)
+Prob::mark_smob () const
 {
-  ASSERT_LIVE_IS_ALLOWED (smob);
+  ASSERT_LIVE_IS_ALLOWED (self_scm ());
 
-  Prob *system = (Prob *) SCM_CELL_WORD_1 (smob);
-  scm_gc_mark (system->mutable_property_alist_);
-  system->derived_mark ();
+  scm_gc_mark (mutable_property_alist_);
+  derived_mark ();
 
-  return system->immutable_property_alist_;
+  return immutable_property_alist_;
 }
 
 int
-Prob::print_smob (SCM smob, SCM port, scm_print_state *)
+Prob::print_smob (SCM port, scm_print_state *) const
 {
-  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;
@@ -147,7 +141,7 @@ Prob::print_smob (SCM smob, SCM port, scm_print_state *)
 SCM
 Prob::internal_get_property (SCM sym) const
 {
-#ifndef NDEBUG
+#ifdef DEBUG
   if (profile_property_accesses)
     note_property_access (&prob_property_lookup_table, sym);
 #endif
@@ -156,11 +150,11 @@ Prob::internal_get_property (SCM sym) const
     TODO: type checking
    */
   SCM s = scm_sloppy_assq (sym, mutable_property_alist_);
-  if (s != SCM_BOOL_F)
+  if (scm_is_true (s))
     return scm_cdr (s);
 
   s = scm_sloppy_assq (sym, immutable_property_alist_);
-  return (s == SCM_BOOL_F) ? SCM_EOL : scm_cdr (s);
+  return scm_is_false (s) ? SCM_EOL : scm_cdr (s);
 }
 
 /* We don't (yet) instrument probs */
@@ -198,6 +192,5 @@ Prob::name () const
   if (scm_is_symbol (nm))
     return ly_symbol2string (nm);
   else
-    return this->class_name ();
+    return class_name ();
 }
-