Merge branch 'jneeman' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

[lilypond.git] / lily / prob.cc

diff --git a/lily/prob.cc b/lily/prob.cc
index 2c651358f3086de4c96182b9a80fa6d6c136f4e4..a45e089a08fce1d1fa53a524b4a9726a04e387f8 100644 (file)
--- a/lily/prob.cc
+++ b/lily/prob.cc
@@ -9,6 +9,7 @@
 #include "prob.hh"
 #include "main.hh"
 #include "item.hh"
+#include "input.hh"
 
 #include "ly-smobs.icc"
 
@@ -41,12 +42,20 @@ Prob::equal_p (SCM sa, SCM sb)
   /* Compare mutable and immutable lists, element by element. */
   for (i = 0; i < 2; i++)
     {
-      SCM aprop = props[0][i], bprop = props[1][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))
+      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) ||
-             !to_boolean (scm_equal_p (scm_cdar (aprop), scm_cdar (bprop))))
+             (
+              !(unsmob_input (aval) && unsmob_input (bval))
+              &&                
+              !to_boolean (scm_equal_p (aval, bval))))
            return SCM_BOOL_F;
        }
 
@@ -101,6 +110,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 ();
@@ -147,6 +158,12 @@ Prob::internal_set_property (SCM sym, SCM val
 #endif
                             ) 
 {
+#ifndef NDEBUG
+  (void) file;
+  (void) line;
+  (void) fun;
+#endif
+
   if (do_internal_type_checking_global)
     type_check_assignment (sym, val);