/*
This file is part of LilyPond, the GNU music typesetter.
- Copyright (C) 1999--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ Copyright (C) 1999--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
LilyPond is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
grace_part_ = Rational (0);
}
-#include "ly-smobs.icc"
-IMPLEMENT_SIMPLE_SMOBS (Moment);
-IMPLEMENT_TYPE_P (Moment, "ly:moment?");
+const char * const Moment::type_p_name_ = "ly:moment?";
-SCM
-Moment::mark_smob (SCM)
-{
- return SCM_EOL;
-}
int
-Moment::print_smob (SCM s, SCM port, scm_print_state *)
+Moment::print_smob (SCM port, scm_print_state *) const
{
- Moment *r = (Moment *) SCM_CELL_WORD_1 (s);
-
scm_puts ("#<Mom ", port);
- string str = r->to_string ();
+ string str = to_string ();
scm_puts ((char *)str.c_str (), port);
scm_puts (">", port);
SCM
Moment::equal_p (SCM a, SCM b)
{
- Moment *m1 = unsmob_moment (a);
- Moment *m2 = unsmob_moment (b);
+ Moment *m1 = unsmob<Moment> (a);
+ Moment *m2 = unsmob<Moment> (b);
return (*m1 == *m2) ? SCM_BOOL_T : SCM_BOOL_F;
}
Moment
robust_scm2moment (SCM m, Moment d)
{
- Moment *p = unsmob_moment (m);
+ Moment *p = unsmob<Moment> (m);
if (!p)
return d;
else
bool
moment_less (SCM a, SCM b)
{
- return *unsmob_moment (a) < *unsmob_moment (b);
+ return *unsmob<Moment> (a) < *unsmob<Moment> (b);
}
-