/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2004--2010 Jan Nieuwenhuizen <janneke@gnu.org>
+ Copyright (C) 2004--2014 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
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)};
+ Prob *probs[2] = {Prob::unsmob (sa), Prob::unsmob (sb)};
SCM props[2][2];
int 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;
- }
+ 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)
+ || (!(Input::unsmob (aval) && Input::unsmob (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_F;
}
return SCM_BOOL_T;
smobify_self ();
}
-
Prob::~Prob ()
{
}
mutable_property_alist_ = src.copy_mutable_properties ();
}
-
SCM
Prob::copy_mutable_properties () const
{
SCM
Prob::mark_smob (SCM smob)
{
- ASSERT_LIVE_IS_ALLOWED ();
+ ASSERT_LIVE_IS_ALLOWED (smob);
Prob *system = (Prob *) SCM_CELL_WORD_1 (smob);
scm_gc_mark (system->mutable_property_alist_);
}
int
-Prob::print_smob (SCM smob, SCM port, scm_print_state*)
+Prob::print_smob (SCM smob, SCM port, scm_print_state *)
{
Prob *p = (Prob *) SCM_CELL_WORD_1 (smob);
scm_puts ("#<", port);
return 1;
}
-
-
SCM
Prob::internal_get_property (SCM sym) const
{
/* We don't (yet) instrument probs */
void
-Prob::instrumented_set_property (SCM sym, SCM val, const char*, int, const char*)
+Prob::instrumented_set_property (SCM sym, SCM val, const char *, int, const char *)
{
internal_set_property (sym, val);
}