X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fprob.cc;h=938f10686164e33d98460e5d1d2bc682b341e90e;hb=4dcd24e4781ec0fe8c92caf64120e53046009753;hp=be4816eece997a0b8af3c8312d430e7f788f4fdb;hpb=7f309e69558db5225b92ae003c0818c68988013d;p=lilypond.git

diff --git a/lily/prob.cc b/lily/prob.cc
index be4816eece..938f106861 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
@@ -36,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] = {Prob::unsmob (sa), Prob::unsmob (sb)};
+  Prob *probs[2] = {unsmob<Prob> (sa), unsmob<Prob> (sb)};
   SCM props[2][2];
   int i;
 
@@ -61,15 +61,14 @@ Prob::equal_p (SCM sa, SCM sb)
         {
           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))))
+          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;
     }
 
@@ -114,7 +113,7 @@ Prob::derived_mark () const
 }
 
 SCM
-Prob::mark_smob ()
+Prob::mark_smob () const
 {
   ASSERT_LIVE_IS_ALLOWED (self_scm ());
 
@@ -125,7 +124,7 @@ Prob::mark_smob ()
 }
 
 int
-Prob::print_smob (SCM port, scm_print_state *)
+Prob::print_smob (SCM port, scm_print_state *) const
 {
   scm_puts ("#<", port);
   scm_puts ("Prob: ", port);
@@ -142,7 +141,7 @@ Prob::print_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
@@ -151,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 */
@@ -193,5 +192,5 @@ Prob::name () const
   if (scm_is_symbol (nm))
     return ly_symbol2string (nm);
   else
-    return this->class_name ();
+    return class_name ();
 }