unsmob_pitch -> Pitch::unsmob and related

[lilypond.git] / lily / prob.cc

diff --git a/lily/prob.cc b/lily/prob.cc
index ce51546d8e0f83f50582e840cecb25b9b09988de..9d668b2969b7c34b786827a6ba490cad3ae356f8 100644 (file)
--- a/lily/prob.cc
+++ b/lily/prob.cc
@@ -1,9 +1,20 @@
 /*
-  prob.cc -- implement Prob
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2004--2014 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 2004--2007 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
+  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 "prob.hh"
@@ -24,10 +35,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;
 
@@ -47,22 +58,21 @@ 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)
+              || (!(unsmob_input (aval) && unsmob_input (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;
@@ -77,7 +87,6 @@ Prob::Prob (SCM type, SCM immutable_init)
   smobify_self ();
 }
 
-
 Prob::~Prob ()
 {
 }
@@ -96,7 +105,6 @@ Prob::Prob (Prob const &src)
   mutable_property_alist_ = src.copy_mutable_properties ();
 }
 
-
 SCM
 Prob::copy_mutable_properties () const
 {
@@ -111,17 +119,17 @@ Prob::derived_mark () const
 SCM
 Prob::mark_smob (SCM smob)
 {
-  ASSERT_LIVE_IS_ALLOWED ();
-  
+  ASSERT_LIVE_IS_ALLOWED (smob);
+
   Prob *system = (Prob *) SCM_CELL_WORD_1 (smob);
   scm_gc_mark (system->mutable_property_alist_);
   system->derived_mark ();
-  
+
   return system->immutable_property_alist_;
 }
 
 int
-Prob::print_smob (SCM smob, SCM port, scm_print_state*)
+Prob::print_smob (SCM smob, SCM port, scm_print_state *)
 {
   Prob *p = (Prob *) SCM_CELL_WORD_1 (smob);
   scm_puts ("#<", port);
@@ -131,13 +139,11 @@ Prob::print_smob (SCM smob, SCM port, scm_print_state*)
   scm_puts (p->class_name (), port);
   scm_display (p->mutable_property_alist_, port);
   scm_display (p->immutable_property_alist_, port);
-  
+
   scm_puts (" >\n", port);
   return 1;
 }
 
-
-
 SCM
 Prob::internal_get_property (SCM sym) const
 {
@@ -157,20 +163,26 @@ Prob::internal_get_property (SCM sym) const
   return (s == SCM_BOOL_F) ? SCM_EOL : scm_cdr (s);
 }
 
+/* We don't (yet) instrument probs */
 void
-Prob::internal_set_property (SCM sym, SCM val) 
+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)
 {
   if (do_internal_type_checking_global)
     type_check_assignment (sym, val);
-  
+
   mutable_property_alist_ = scm_assq_set_x (mutable_property_alist_, sym, val);
 }
 
 void
-Prob::type_check_assignment (SCM sym, SCM val) const
+Prob::type_check_assignment (SCM, SCM) const
 {
-  (void) sym;
-  (void) val;
+  /* empty */
 }
 
 SCM