/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 2004--2014 Jan Nieuwenhuizen <janneke@gnu.org>
+ Copyright (C) 2004--2015 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
#include "profile.hh"
-const char Prob::type_p_name_[] = "ly:prob?";
+const char * const Prob::type_p_name_ = "ly:prob?";
SCM
Prob::equal_p (SCM sa, SCM sb)
equality; e.g., that two probs are equal iff they can be
distinguished by calls to ly:prob-property.
*/
- Prob *probs[2] = {Prob::unsmob (sa), Prob::unsmob (sb)};
+ Prob *probs[2] = {unsmob<Prob> (sa), unsmob<Prob> (sb)};
SCM props[2][2];
int i;
{
SCM aval = scm_cdar (aprop);
SCM bval = scm_cdar (bprop);
- if (scm_caar (aprop) != scm_caar (bprop)
- || (!(Input::is_smob (aval) && Input::is_smob (bval))
- &&
- !to_boolean (scm_equal_p (aval, bval))))
+ if (!scm_is_eq (scm_caar (aprop), scm_caar (bprop))
+ || (!(unsmob<Input> (aval) && unsmob<Input> (bval))
+ && !ly_is_equal (aval, bval)))
return SCM_BOOL_F;
}
/* is one list shorter? */
- if (aprop != SCM_EOL || bprop != SCM_EOL)
+ if (!scm_is_null (aprop) || !scm_is_null (bprop))
return SCM_BOOL_F;
}
return SCM_BOOL_T;
}
-Prob::Prob (SCM type, SCM immutable_init)
+Prob::Prob (SCM type, SCM immutable_init) : Smob<Prob> ()
{
mutable_property_alist_ = SCM_EOL;
immutable_property_alist_ = immutable_init;
}
Prob::Prob (Prob const &src)
+ : Smob<Prob> ()
{
immutable_property_alist_ = src.immutable_property_alist_;
mutable_property_alist_ = SCM_EOL;
}
SCM
-Prob::mark_smob ()
+Prob::mark_smob () const
{
ASSERT_LIVE_IS_ALLOWED (self_scm ());
}
int
-Prob::print_smob (SCM port, scm_print_state *)
+Prob::print_smob (SCM port, scm_print_state *) const
{
scm_puts ("#<", port);
scm_puts ("Prob: ", port);
SCM
Prob::internal_get_property (SCM sym) const
{
-#ifndef NDEBUG
+#ifdef DEBUG
if (profile_property_accesses)
note_property_access (&prob_property_lookup_table, sym);
#endif
TODO: type checking
*/
SCM s = scm_sloppy_assq (sym, mutable_property_alist_);
- if (s != SCM_BOOL_F)
+ if (scm_is_true (s))
return scm_cdr (s);
s = scm_sloppy_assq (sym, immutable_property_alist_);
- return (s == SCM_BOOL_F) ? SCM_EOL : scm_cdr (s);
+ return scm_is_false (s) ? SCM_EOL : scm_cdr (s);
}
/* We don't (yet) instrument probs */
if (scm_is_symbol (nm))
return ly_symbol2string (nm);
else
- return this->class_name ();
+ return class_name ();
}