X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fprob-scheme.cc;h=a9424da91f5479da82a5c9cf699dec332119e0f5;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=119688e1570712696fc2a9746d0696366104fd96;hpb=e18531db1f79fb685fbd16d6a2a67bf4b6c09915;p=lilypond.git

diff --git a/lily/prob-scheme.cc b/lily/prob-scheme.cc
index 119688e157..a9424da91f 100644
--- a/lily/prob-scheme.cc
+++ b/lily/prob-scheme.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2005--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 2005--2015 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
@@ -20,11 +20,11 @@
 #include "prob.hh"
 
 LY_DEFINE (ly_prob_set_property_x, "ly:prob-set-property!",
-	   2, 1, 0, (SCM obj, SCM sym, SCM value),
-	   "Set property @var{sym} of @var{obj} to @var{value}.")
+           2, 1, 0, (SCM obj, SCM sym, SCM value),
+           "Set property @var{sym} of @var{obj} to @var{value}.")
 {
   LY_ASSERT_SMOB (Prob, obj, 1);
-  Prob *ps = unsmob_prob (obj);
+  Prob *ps = unsmob<Prob> (obj);
   LY_ASSERT_TYPE (ly_is_symbol, sym, 2);
 
   ps->set_property (sym, value);
@@ -35,45 +35,45 @@ LY_DEFINE (ly_prob_set_property_x, "ly:prob-set-property!",
   Hmm, this is not orthogonal.
 */
 LY_DEFINE (ly_prob_property_p, "ly:prob-property?",
-	   2, 1, 0, (SCM obj, SCM sym),
-	   "Is boolean prop @var{sym} set?")
+           2, 1, 0, (SCM obj, SCM sym),
+           "Is boolean prop @var{sym} of @var{sym} set?")
 {
   return scm_equal_p (SCM_BOOL_T, ly_prob_property (obj, sym, SCM_BOOL_F));
 }
 
 LY_DEFINE (ly_prob_property, "ly:prob-property",
-	   2, 1, 0, (SCM prob, SCM sym, SCM val),
-	   "Return the value for property @var{sym} of Prob object"
-	   " @var{prob}.  If no value is found, return @var{val} or"
-	   " @code{'()} if @var{val} is not specified.")
+           2, 1, 0, (SCM prob, SCM sym, SCM val),
+           "Return the value for property @var{sym} of Prob object"
+           " @var{prob}.  If no value is found, return @var{val} or"
+           " @code{'()} if @var{val} is not specified.")
 {
   LY_ASSERT_SMOB (Prob, prob, 1);
-  Prob *ps = unsmob_prob (prob);
+  Prob *ps = unsmob<Prob> (prob);
   LY_ASSERT_TYPE (ly_is_symbol, sym, 2);
 
-  if (val == SCM_UNDEFINED)
+  if (SCM_UNBNDP (val))
     val = SCM_EOL;
 
-  SCM retval = ps->internal_get_property (sym);
-  if (retval == SCM_EOL)
+  SCM retval = ps->get_property (sym);
+  if (scm_is_null (retval))
     return val;
   else
     return retval;
 }
 
 LY_DEFINE (ly_prob_type_p, "ly:prob-type?",
-	   2, 0, 0,
-	   (SCM obj, SCM type),
-	   "Is @var{obj} the specified prob-type?")
+           2, 0, 0,
+           (SCM obj, SCM type),
+           "Is @var{obj} the specified prob-type?")
 {
-  Prob*prob = unsmob_prob (obj);
-  return scm_from_bool (prob && prob->type () == type);
+  Prob *prob = unsmob<Prob> (obj);
+  return scm_from_bool (prob && scm_is_eq (prob->type (), type));
 }
 
 LY_DEFINE (ly_make_prob, "ly:make-prob",
-	   2, 0, 1,
-	   (SCM type, SCM init, SCM rest),
-	   "Create a @code{Prob} object.")
+           2, 0, 1,
+           (SCM type, SCM init, SCM rest),
+           "Create a @code{Prob} object.")
 {
   Prob *pr = new Prob (type, init);
 
@@ -85,28 +85,27 @@ LY_DEFINE (ly_make_prob, "ly:make-prob",
 
       pr->set_property (sym, val);
     }
-  
+
   return pr->unprotect ();
 }
 
-
 LY_DEFINE (ly_prob_mutable_properties, "ly:prob-mutable-properties",
-	   1, 0, 0,
-	   (SCM prob),
-	   "Retrieve an alist of mutable properties.")
+           1, 0, 0,
+           (SCM prob),
+           "Retrieve an alist of mutable properties.")
 {
   LY_ASSERT_SMOB (Prob, prob, 1);
-  Prob *ps = unsmob_prob (prob);
+  Prob *ps = unsmob<Prob> (prob);
   return ps->get_property_alist (true);
 }
 
 LY_DEFINE (ly_prob_immutable_properties, "ly:prob-immutable-properties",
-	   1, 0, 0,
-	   (SCM prob),
-	   "Retrieve an alist of mutable properties.")
+           1, 0, 0,
+           (SCM prob),
+           "Retrieve an alist of immutable properties.")
 {
   LY_ASSERT_SMOB (Prob, prob, 1);
-  Prob *ps = unsmob_prob (prob);
+  Prob *ps = unsmob<Prob> (prob);
   return ps->get_property_alist (false);
 }