X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fprob.cc;h=4e068fa4d45301a7b19daea13b277e55e7795353;hb=2a00c69a012d4ccaf24a036bdb5ac9ea43fb9604;hp=4dbd2858ababb7b9921bf7ed3c6c0dea4ce4cff8;hpb=dbb4524af169a9c15e5c7fcfddfa1a4b85dd288d;p=lilypond.git

diff --git a/lily/prob.cc b/lily/prob.cc
index 4dbd2858ab..4e068fa4d4 100644
--- a/lily/prob.cc
+++ b/lily/prob.cc
@@ -1,29 +1,83 @@
 /*
-  paper-system.cc -- implement Paper_system
+  prob.cc -- implement Prob
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2004--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+  (c) 2004--2007 Jan Nieuwenhuizen <janneke@gnu.org>
 */
 
 #include "prob.hh"
 #include "main.hh"
 #include "item.hh"
+#include "input.hh"
+#include "profile.hh"
 
 #include "ly-smobs.icc"
 
 IMPLEMENT_SMOBS (Prob);
 IMPLEMENT_TYPE_P (Prob, "ly:prob?");
-IMPLEMENT_DEFAULT_EQUAL_P (Prob);
 
-Prob::Prob (SCM immutable_init)
+SCM
+Prob::equal_p (SCM sa, SCM sb)
+{
+  /* This comparison function is only designed to make the copy
+     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
+     distinguished by calls to ly:prob-property.
+  */
+  Prob *probs[2] = {unsmob_prob (sa), unsmob_prob (sb)};
+  SCM props[2][2];
+  int i;
+
+  for (i = 0; i < 2; i++)
+    {
+      props[i][0] = probs[i]->immutable_property_alist_;
+      props[i][1] = probs[i]->mutable_property_alist_;
+    }
+
+  if (strcmp (probs[0]->class_name (), probs[1]->class_name ()))
+    return SCM_BOOL_F;
+
+  /* Compare mutable and immutable lists, element by element. */
+  for (i = 0; i < 2; i++)
+    {
+      SCM aprop = props[0][i];
+      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;
+	}
+
+      /* is one list shorter? */
+      if (aprop != SCM_EOL || bprop != SCM_EOL)
+	return SCM_BOOL_F;
+    }
+
+  return SCM_BOOL_T;
+}
+
+Prob::Prob (SCM type, SCM immutable_init)
 {
   self_scm_ = SCM_EOL;
   mutable_property_alist_ = SCM_EOL;
   immutable_property_alist_ = immutable_init;
+  type_ = type;
   smobify_self ();
 }
 
+
 Prob::~Prob ()
 {
 }
@@ -33,6 +87,7 @@ Prob::Prob (Prob const &src)
   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,
      stack vars that hold the copy might be optimized away, meaning
@@ -56,6 +111,8 @@ Prob::derived_mark () const
 SCM
 Prob::mark_smob (SCM smob)
 {
+  ASSERT_LIVE_IS_ALLOWED ();
+  
   Prob *system = (Prob *) SCM_CELL_WORD_1 (smob);
   scm_gc_mark (system->mutable_property_alist_);
   system->derived_mark ();
@@ -69,8 +126,8 @@ Prob::print_smob (SCM smob, SCM port, scm_print_state*)
   Prob *p = (Prob *) SCM_CELL_WORD_1 (smob);
   scm_puts ("#<", port);
   scm_puts ("Prob: ", port);
-
-  
+  scm_display (p->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);
@@ -84,6 +141,11 @@ Prob::print_smob (SCM smob, SCM port, scm_print_state*)
 SCM
 Prob::internal_get_property (SCM sym) const
 {
+#ifndef NDEBUG
+  if (profile_property_accesses)
+    note_property_access (&prob_property_lookup_table, sym);
+#endif
+
   /*
     TODO: type checking
    */
@@ -95,6 +157,13 @@ 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::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) 
 {
@@ -117,7 +186,7 @@ Prob::get_property_alist (bool m) const
   return (m) ? mutable_property_alist_ : immutable_property_alist_;
 }
 
-String
+string
 Prob::name () const
 {
   SCM nm = get_property ("name");