X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=lily%2Fprob.cc;h=233c5b6d5f0a604e5ff19d1805328114a4ee28f4;hb=d490bfce5e0ef8d4f4925692b922409e7b98a22d;hp=9c3b40d712640c79aad814c8ed24c3b85c889c25;hpb=59fd89c32399b67464b217ba31502051c91bb919;p=lilypond.git

diff --git a/lily/prob.cc b/lily/prob.cc
index 9c3b40d712..233c5b6d5f 100644
--- 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--2011 Jan Nieuwenhuizen <janneke@gnu.org>
 
-  (c) 2004--2006 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,7 +35,7 @@ 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)};
@@ -47,7 +58,7 @@ Prob::equal_p (SCM sa, SCM sb)
       SCM bprop = props[1][i];
 
       for (;
-	   scm_is_pair (aprop) && scm_is_pair(bprop);
+	   scm_is_pair (aprop) && scm_is_pair (bprop);
 	   aprop = scm_cdr (aprop), bprop = scm_cdr (bprop))
 	{
 	  SCM aval = scm_cdar (aprop);
@@ -55,7 +66,7 @@ Prob::equal_p (SCM sa, SCM sb)
 	  if (scm_caar (aprop) != scm_caar (bprop) ||
 	      (
 	       !(unsmob_input (aval) && unsmob_input (bval))
-	       &&		 
+	       &&
 	       !to_boolean (scm_equal_p (aval, bval))))
 	    return SCM_BOOL_F;
 	}
@@ -111,12 +122,12 @@ Prob::derived_mark () const
 SCM
 Prob::mark_smob (SCM smob)
 {
-  ASSERT_LIVE_IS_ALLOWED();
-  
+  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_;
 }
 
@@ -131,7 +142,7 @@ 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;
 }
@@ -157,30 +168,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
-#ifndef NDEBUG
-			     , char const *file, int line, char const *fun
-#endif
-			     ) 
+Prob::instrumented_set_property (SCM sym, SCM val, const char*, int, const char*)
 {
-#ifndef NDEBUG
-  (void) file;
-  (void) line;
-  (void) fun;
-#endif
+  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