X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmoment.cc;h=e8c47c37e2dfa09dcd430a3d77e388f88390007d;hb=7dfd01bf92557e33629fcc6930a4f97031470fc8;hp=1f7f62e77384cd74b5c1331537b2f5a2bbda5856;hpb=54404c570a48ddf9772c5ca64a154d0c0149e61e;p=lilypond.git

diff --git a/lily/moment.cc b/lily/moment.cc
index 1f7f62e773..e8c47c37e2 100644
--- a/lily/moment.cc
+++ b/lily/moment.cc
@@ -1,78 +1,138 @@
 /*   
   moment.cc --  implement Moment
-  
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2001 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_UNSMOB (Moment,moment);
-IMPLEMENT_SIMPLE_SMOBS (Moment);
-IMPLEMENT_TYPE_P (Moment, "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 *) gh_cdr (s);
+  Moment  *r = (Moment *) ly_cdr (s);
      
   scm_puts ("#<Mom ", port);
-  String str (r->str ());
-  scm_puts ((char *)str.ch_C (), port);
-  scm_puts (" >", port);
+  String str = r->to_string ();
+  scm_puts ((char *)str.to_str0 (), port);
+  scm_puts (">", port);
   
   return 1;
 }
 
-/*
-  TODO: add optional factor argument.
- */
-SCM
-make_rational (SCM n, SCM d)
-{
-  Moment m (1,1);
-
-  if (SCM_INUMP (n) && SCM_INUMP (d))
+/* 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)
     {
-      m =  Moment (gh_scm2int (n), gh_scm2int (d));
+      SCM_ASSERT_TYPE (scm_is_integer (gn), gn, SCM_ARG3, __FUNCTION__, "integer");
+      grace_num = ly_scm2int (gn);
     }
-  else
+
+  int grace_den = 1;
+  if (gd != SCM_UNDEFINED)
     {
-      ::error ("make-moment takes two integer arguments. Using 1/1");
+      SCM_ASSERT_TYPE (scm_is_integer (gd), gd, SCM_ARG4, __FUNCTION__, "integer");
+      grace_den = ly_scm2int (gd);
     }
 
-  return m.smobbed_copy ();
+  return Moment (Rational (ly_scm2int (n), ly_scm2int (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 ();
+}
 
-void
-init_moments ()
+LY_DEFINE (ly_mul_moment,"ly:mul-moment",
+	   2, 0, 0, (SCM a, SCM b),
+	   "Multiply two moments.")
 {
-  scm_c_define_gsubr ("make-moment", 2 , 0, 0, (Scheme_function_unknown) make_rational);
+  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 ();
 }
 
-ADD_SCM_INIT_FUNC (moms,init_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);
+  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_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);
+  SCM_ASSERT_TYPE (ma, a, SCM_ARG1, __FUNCTION__, "moment");
+  SCM_ASSERT_TYPE (mb, b, SCM_ARG2, __FUNCTION__, "moment");
+  return ly_bool2scm (*ma <  *mb);
+}
 
 SCM
 Moment::equal_p (SCM a, SCM b)
@@ -101,29 +161,6 @@ Moment::compare (Moment const &a, Moment const &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 (int m, int n)
-{
-  main_part_ = Rational (m,n);
-  grace_part_  = Rational (0);
-}
-
-Moment::Moment (Rational m)
-{
-  main_part_ = m;
-  grace_part_  = Rational (0);
-}
-
 void
 Moment::operator += (Moment const &src)
 {
@@ -139,7 +176,7 @@ Moment::operator -= (Moment const &src)
 
 /*
   only take the main part of SRC for multiplication.
- */
+*/
 void
 Moment::operator *= (Moment const &src)
 {
@@ -149,7 +186,7 @@ Moment::operator *= (Moment const &src)
 
 /*
   only take the main part of SRC for multiplication.
- */
+*/
 void
 Moment::operator /= (Moment const &src)
 {
@@ -157,19 +194,17 @@ Moment::operator /= (Moment const &src)
   grace_part_ /= src.main_part_;
 }
 
-
-#if 0
-Moment::operator Rational()
+int
+Moment::den () const
 {
-  return main_part_;
+  return main_part_.den ();
 }
-#endif
-
-int
-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
@@ -183,23 +218,32 @@ Moment::set_infinite (int k)
   main_part_.set_infinite (k);
 }
 
-
 String
-Moment::str () const
+Moment::to_string () const
 {
-  String s =  main_part_.str ();
+  String s =  main_part_.to_string ();
   if (grace_part_)
     {
-      s += "G" + grace_part_.str ();
+      s += "G" + grace_part_.to_string ();
     }
   return s;
 }
 
 Moment
-Moment::operator - ( ) const
+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)
+{
+  os << m.to_string ();
+  return os;
+}
+#endif