source file of the GNU LilyPond music typesetter
- (c) 2004--2006 Jan Nieuwenhuizen <janneke@gnu.org>
+ (c) 2004--2009 Jan Nieuwenhuizen <janneke@gnu.org>
*/
#include "prob.hh"
#include "main.hh"
#include "item.hh"
-
+#include "input.hh"
+#include "profile.hh"
+#include <cstring>
#include "ly-smobs.icc"
IMPLEMENT_SMOBS (Prob);
/* 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;
}
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_);
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
*/
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);
}
void
-Prob::type_check_assignment (SCM sym, SCM val) const
+Prob::type_check_assignment (SCM, SCM) const
{
- (void) sym;
- (void) val;
+ /* empty */
}
SCM