/*
moment.cc -- implement Moment
-
+
source file of the GNU LilyPond music typesetter
-
- (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-
- */
+ (c) 1999--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+*/
#include "lily-guile.hh"
#include "moment.hh"
#include "warn.hh"
-#include "ly-smobs.icc"
-IMPLEMENT_SIMPLE_SMOBS (Moment);
-IMPLEMENT_TYPE_P (Moment, "ly:moment?");
-SCM
-Moment::mark_smob (SCM)
+Moment::Moment ()
{
- return SCM_EOL;
}
+Moment::Moment (int m)
+{
+ main_part_ = Rational (m);
+ grace_part_ = Rational ( 0);
+}
-SCM
-Moment::smobbed_copy () const
+Moment::Moment (Rational m, Rational g)
+{
+ main_part_ = m;
+ grace_part_ = g;
+}
+
+Moment::Moment (Rational m)
{
- Moment * m = new Moment (*this);
- return m->smobbed_self ();
+ main_part_ = m;
+ 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;
+}
int
Moment::print_smob (SCM s, SCM port, scm_print_state *)
{
- Moment *r = (Moment *) ly_cdr (s);
+ Moment *r = (Moment *) SCM_CELL_WORD_1 (s);
scm_puts ("#<Mom ", port);
String str = r->to_string ();
return 1;
}
-/*
- TODO: add optional factor argument.
-*/
-LY_DEFINE (make_moment,"ly:make-moment", 2,0,0, (SCM n, SCM d),
- "create the rational number with main timing @var{n}/@var{d}. \n"
+SCM
+Moment::as_scheme () const
+{
+ return scm_list_5 (ly_symbol2scm ("ly:make-moment"),
+ scm_from_int (main_part_.num()),
+ scm_from_int (main_part_.den()),
+ scm_from_int (grace_part_.num()),
+ scm_from_int (grace_part_.den()));
+}
+
+/* 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\n"
- "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\n"
- "notes, @var{g} is zero.\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_INUMP (n), n, SCM_ARG1, __FUNCTION__, "integer");
- SCM_ASSERT_TYPE(SCM_INUMP (d), d, SCM_ARG2, __FUNCTION__, "integer");
+ 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 (gh_scm2int (n), gh_scm2int (d))).smobbed_copy();
+ return Moment (Rational (scm_to_int (n), scm_to_int (d)),
+ Rational (grace_num, grace_den)).smobbed_copy ();
}
-LY_DEFINE (add_moment,"ly:add-moment", 2,0,0, (SCM a, SCM b),
- "Add two moments."
- )
+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);
+ 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 (*ma + *mb).smobbed_copy ();
}
-
-LY_DEFINE (mul_moment,"ly:mul-moment", 2,0,0, (SCM a, SCM b),
- "Multiply two moments."
- )
+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);
+ 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 (*ma * *mb).smobbed_copy ();
}
-
-
-LY_DEFINE (div_moment,"ly:div-moment", 2,0,0, (SCM a, SCM b),
- "Divide two moments."
- )
+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);
+ 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 (*ma / *mb).smobbed_copy ();
}
-LY_DEFINE (ly_moment_less_p,"ly:moment<?", 2,0,0, (SCM a, SCM b),
+LY_DEFINE (ly_moment_less_p,"ly:moment<?",
+ 2, 0, 0, (SCM a, SCM b),
"Compare two moments.")
{
- Moment * ma = unsmob_moment (a);
- Moment * mb = unsmob_moment (b);
+ 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 gh_bool2scm (*ma < *mb);
+ return ly_bool2scm (*ma < *mb);
}
-
-
SCM
Moment::equal_p (SCM a, SCM b)
{
return Rational::compare (a.grace_part_, b.grace_part_);
}
-Moment::Moment ()
-{
-
-}
-
-Moment::Moment (int m)
-{
- main_part_ = Rational(m);
- grace_part_ = Rational( 0);
-}
-
-Moment::Moment (Rational m, Rational g)
-{
- main_part_ = m;
- grace_part_ = g;
-}
-
-Moment::Moment (Rational m)
-{
- main_part_ = m;
- grace_part_ = Rational (0);
-}
-
void
Moment::operator += (Moment const &src)
{
grace_part_ /= src.main_part_;
}
-
-
int
-Moment::den () const { return main_part_.den (); }
+Moment::den () const
+{
+ return main_part_.den ();
+}
int
-Moment::num () const { return main_part_.num (); }
+Moment::num () const
+{
+ return main_part_.num ();
+}
bool
Moment::to_bool () const
main_part_.set_infinite (k);
}
-
String
Moment::to_string () const
{
return os;
}
#endif
+
+Moment
+robust_scm2moment (SCM m, Moment d)
+{
+ 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);
+}
+
projects / lilypond.git / blobdiff