#include "prob.hh"
#include "main.hh"
#include "item.hh"
+#include "input.hh"
#include "ly-smobs.icc"
IMPLEMENT_SMOBS (Prob);
IMPLEMENT_TYPE_P (Prob, "ly:prob?");
-IMPLEMENT_DEFAULT_EQUAL_P (Prob);
+
+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)
{
smobify_self ();
}
+
Prob::~Prob ()
{
}
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 ();
}
void
-Prob::internal_set_property (SCM sym, SCM val)
+Prob::internal_set_property (SCM sym, SCM val
+#ifndef NDEBUG
+ , char const *file, int line, char const *fun
+#endif
+ )
{
+#ifndef NDEBUG
+ (void) file;
+ (void) line;
+ (void) fun;
+#endif
+
if (do_internal_type_checking_global)
type_check_assignment (sym, val);
return (m) ? mutable_property_alist_ : immutable_property_alist_;
}
-std::string
+string
Prob::name () const
{
SCM nm = get_property ("name");