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

diff --git a/lily/moment.cc b/lily/moment.cc
index 1f7f62e773..30941e31d7 100644
--- a/lily/moment.cc
+++ b/lily/moment.cc
@@ -1,175 +1,146 @@
-/*   
-  moment.cc --  implement Moment
-  
+/*
+  moment.cc -- implement Moment
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
 
+  (c) 1999--2008 Han-Wen Nienhuys <hanwen@xs4all.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?");
+Moment::Moment ()
+{
+}
 
-SCM
-Moment::mark_smob (SCM)
+Moment::Moment (int m)
 {
-  return SCM_EOL;
+  main_part_ = Rational (m);
+  grace_part_ = Rational (0);
 }
 
+Moment::Moment (Rational m, Rational g)
+{
+  main_part_ = m;
+  grace_part_ = g;
+}
 
-SCM
-Moment::smobbed_copy () const
+Moment::Moment (Rational m)
 {
-  Moment * m = new Moment (*this);
-  return m->smobbed_self ();
+  main_part_ = m;
+  grace_part_ = Rational (0);
 }
 
+#include "ly-smobs.icc"
 
-int
-Moment::print_smob (SCM s, SCM port, scm_print_state *)
+IMPLEMENT_SIMPLE_SMOBS (Moment);
+IMPLEMENT_TYPE_P (Moment, "ly:moment?");
+
+SCM
+Moment::mark_smob (SCM)
 {
-  Moment  *r = (Moment *) gh_cdr (s);
-     
-  scm_puts ("#<Mom ", port);
-  String str (r->str ());
-  scm_puts ((char *)str.ch_C (), port);
-  scm_puts (" >", port);
-  
-  return 1;
+  return SCM_EOL;
 }
 
-/*
-  TODO: add optional factor argument.
- */
-SCM
-make_rational (SCM n, SCM d)
+int
+Moment::print_smob (SCM s, SCM port, scm_print_state *)
 {
-  Moment m (1,1);
+  Moment *r = (Moment *) SCM_CELL_WORD_1 (s);
 
-  if (SCM_INUMP (n) && SCM_INUMP (d))
-    {
-      m =  Moment (gh_scm2int (n), gh_scm2int (d));
-    }
-  else
-    {
-      ::error ("make-moment takes two integer arguments. Using 1/1");
-    }
+  scm_puts ("#<Mom ", port);
+  string str = r->to_string ();
+  scm_puts ((char *)str.c_str (), port);
+  scm_puts (">", port);
 
-  return m.smobbed_copy ();
+  return 1;
 }
 
-
-void
-init_moments ()
+SCM
+Moment::as_scheme () const
 {
-  scm_c_define_gsubr ("make-moment", 2 , 0, 0, (Scheme_function_unknown) make_rational);
+  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 ()));
 }
 
-ADD_SCM_INIT_FUNC (moms,init_moments);
-
 SCM
 Moment::equal_p (SCM a, SCM 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;
 
   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)
 {
-  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_;
 }
 
-
-#if 0
-Moment::operator Rational()
+/* Only take the main part of SRC for division.  */
+void
+Moment::operator %= (Moment const &src)
 {
-  return main_part_;
+  main_part_ %= src.main_part_;
+  grace_part_ %= src.main_part_;
 }
-#endif
 
-int
-Moment::den () const { return main_part_.den (); }
+I64
+Moment::den () const
+{
+  /* TODO: ensure MSB == 0 here */
+  return main_part_.den ();
+}
 
-int
-Moment::num () const { return main_part_.num (); }
+I64
+Moment::num () const
+{
+  return main_part_.num ();
+}
 
 bool
 Moment::to_bool () const
@@ -183,23 +154,46 @@ Moment::set_infinite (int k)
   main_part_.set_infinite (k);
 }
 
-
-String
-Moment::str () const
+string
+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_;
   return m;
 }
+
+#ifdef STREAM_SUPPORT
+ostream &
+operator << (ostream &os, Moment const &m)
+{
+  os << m.to_string ();
+  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);
+}
+