-/*
- moment.cc -- implement Moment
+/*
+ This file is part of LilyPond, the GNU music typesetter.
+
+ 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
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- source file of the GNU LilyPond music typesetter
+ LilyPond is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+ You should have received a copy of the GNU General Public License
+ along with LilyPond. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "lily-guile.hh"
#include "moment.hh"
-#include "warn.hh"
+#include "warn.hh"
Moment::Moment ()
{
Moment::Moment (int m)
{
main_part_ = Rational (m);
- grace_part_ = Rational ( 0);
+ grace_part_ = Rational (0);
}
Moment::Moment (Rational m, Rational g)
grace_part_ = Rational (0);
}
-#include "ly-smobs.icc"
-IMPLEMENT_SIMPLE_SMOBS (Moment);
-IMPLEMENT_TYPE_P (Moment, "ly:moment?");
-SCM
-Moment::mark_smob (SCM)
-{
- return SCM_EOL;
-}
+const char * const Moment::type_p_name_ = "ly:moment?";
+
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 ();
- scm_puts ((char *)str.to_str0 (), port);
+ string str = to_string ();
+ scm_puts ((char *)str.c_str (), port);
scm_puts (">", port);
-
- return 1;
-}
-
-/* TODO: add optional factor argument. */
-LY_DEFINE (ly_make_moment, "ly:make-moment",
- 2, 2, 0, (SCM n, SCM d, SCM gn, SCM gd),
- "Create the rational number with main timing @var{n}/@var{d}, "
- "and optional grace timin @var{gn}/@var{gd}.\n"
- "\n"
- "\n"
- "Moment is a point in musical time. "
- "It is consists of a pair of rationals (@var{m},@var{g}), "
- "where @var{m} is the timing for the main\n"
- "notes, and @var{g} the timing for grace notes. "
- "In absence of grace notes, @var{g} is zero.\n")
-{
- SCM_ASSERT_TYPE (scm_is_integer (n), n, SCM_ARG1, __FUNCTION__, "integer");
- SCM_ASSERT_TYPE (scm_is_integer (d), d, SCM_ARG2, __FUNCTION__, "integer");
-
- int grace_num = 0;
- if (gn != SCM_UNDEFINED)
- {
- SCM_ASSERT_TYPE (scm_is_integer (gn), gn, SCM_ARG3, __FUNCTION__, "integer");
- grace_num = scm_to_int (gn);
- }
-
- int grace_den = 1;
- if (gd != SCM_UNDEFINED)
- {
- SCM_ASSERT_TYPE (scm_is_integer (gd), gd, SCM_ARG4, __FUNCTION__, "integer");
- grace_den = scm_to_int (gd);
- }
-
- return Moment (Rational (scm_to_int (n), scm_to_int (d)),
- Rational (grace_num, grace_den)).smobbed_copy ();
-}
-
-LY_DEFINE (ly_add_moment, "ly:add-moment",
- 2, 0, 0, (SCM a, SCM b),
- "Add two moments.")
-{
- Moment *ma = unsmob_moment (a);
- Moment *mb = unsmob_moment (b);
- SCM_ASSERT_TYPE (ma, a, SCM_ARG1, __FUNCTION__, "moment");
- SCM_ASSERT_TYPE (mb, b, SCM_ARG2, __FUNCTION__, "moment");
- return (*ma + *mb).smobbed_copy ();
-}
-
-LY_DEFINE (ly_mul_moment,"ly:mul-moment",
- 2, 0, 0, (SCM a, SCM b),
- "Multiply two moments.")
-{
- Moment *ma = unsmob_moment (a);
- Moment *mb = unsmob_moment (b);
- SCM_ASSERT_TYPE (ma, a, SCM_ARG1, __FUNCTION__, "moment");
- SCM_ASSERT_TYPE (mb, b, SCM_ARG2, __FUNCTION__, "moment");
- return (*ma * *mb).smobbed_copy ();
-}
-LY_DEFINE (ly_div_moment,"ly:div-moment",
- 2, 0, 0, (SCM a, SCM b),
- "Divide two moments.")
-{
- Moment *ma = unsmob_moment (a);
- Moment *mb = unsmob_moment (b);
- SCM_ASSERT_TYPE (ma, a, SCM_ARG1, __FUNCTION__, "moment");
- SCM_ASSERT_TYPE (mb, b, SCM_ARG2, __FUNCTION__, "moment");
- return (*ma / *mb).smobbed_copy ();
+ return 1;
}
-LY_DEFINE (ly_moment_less_p,"ly:moment<?",
- 2, 0, 0, (SCM a, SCM b),
- "Compare two moments.")
+SCM
+Moment::as_scheme () const
{
- Moment *ma = unsmob_moment (a);
- Moment *mb = unsmob_moment (b);
- SCM_ASSERT_TYPE (ma, a, SCM_ARG1, __FUNCTION__, "moment");
- SCM_ASSERT_TYPE (mb, b, SCM_ARG2, __FUNCTION__, "moment");
- return ly_bool2scm (*ma < *mb);
+ return scm_list_5 (ly_symbol2scm ("ly:make-moment"),
+ scm_from_int64 (main_part_.num ()),
+ scm_from_int64 (main_part_.den ()),
+ scm_from_int64 (grace_part_.num ()),
+ scm_from_int64 (grace_part_.den ()));
}
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;
}
-/****************************************************************/
-
int
compare (Moment const &a, Moment const &b)
{
- return Moment::compare (a,b);
+ return Moment::compare (a, b);
}
int
Moment::compare (Moment const &a, Moment const &b)
{
- int c = Rational::compare (a.main_part_,b.main_part_);
+ int c = Rational::compare (a.main_part_, b.main_part_);
if (c)
return c;
void
Moment::operator += (Moment const &src)
{
- main_part_ +=src.main_part_ ;
+ main_part_ += src.main_part_;
grace_part_ += src.grace_part_;
}
+
void
Moment::operator -= (Moment const &src)
{
- main_part_ -= src.main_part_ ;
+ main_part_ -= src.main_part_;
grace_part_ -= src.grace_part_;
}
-/*
- only take the main part of SRC for multiplication.
-*/
+/* Only take the main part of SRC for multiplication. */
void
Moment::operator *= (Moment const &src)
{
- main_part_ *= src.main_part_ ;
+ main_part_ *= src.main_part_;
grace_part_ *= src.main_part_;
}
-/*
- only take the main part of SRC for multiplication.
-*/
+/* Only take the main part of SRC for division. */
void
Moment::operator /= (Moment const &src)
{
- main_part_ /= src.main_part_ ;
+ main_part_ /= src.main_part_;
grace_part_ /= src.main_part_;
}
-int
+/* Only take the main part of SRC for division. */
+void
+Moment::operator %= (Moment const &src)
+{
+ main_part_ %= src.main_part_;
+ grace_part_ %= src.main_part_;
+}
+
+I64
Moment::den () const
{
+ /* TODO: ensure MSB == 0 here */
return main_part_.den ();
}
-int
+I64
Moment::num () const
{
return main_part_.num ();
main_part_.set_infinite (k);
}
-String
+string
Moment::to_string () const
{
- String s = main_part_.to_string ();
+ string s = main_part_.to_string ();
if (grace_part_)
- {
- s += "G" + grace_part_.to_string ();
- }
+ s += "G" + grace_part_.to_string ();
return s;
}
Moment::operator - () const
{
Moment m;
- m.grace_part_ = - grace_part_;
- m. main_part_ = - main_part_ ;
+ m.grace_part_ = -grace_part_;
+ m.main_part_ = -main_part_;
return m;
}
-
#ifdef STREAM_SUPPORT
-std::ostream &
-operator << (std::ostream &os, Moment const &m)
+ostream &
+operator << (ostream &os, Moment const &m)
{
os << m.to_string ();
return os;
Moment
robust_scm2moment (SCM m, Moment d)
{
- Moment * p = unsmob_moment (m);
+ Moment *p = unsmob<Moment> (m);
if (!p)
return d;
else
return *p;
}
-
bool
moment_less (SCM a, SCM b)
{
- return *unsmob_moment (a) < *unsmob_moment (b);
+ return *unsmob<Moment> (a) < *unsmob<Moment> (b);
}
-
projects / lilypond.git / blobdiff