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

diff --git a/lily/moment.cc b/lily/moment.cc
index 7b92cdbdcc..30941e31d7 100644
--- a/lily/moment.cc
+++ b/lily/moment.cc
@@ -1,21 +1,41 @@
-/*   
-  moment.cc --  implement Moment
-  
+/*
+  moment.cc -- implement Moment
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 1999--2000 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"
+
+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);
+}
+
 #include "ly-smobs.icc"
 
-IMPLEMENT_UNSMOB(Moment,moment);
-IMPLEMENT_SIMPLE_SMOBS(Moment);
-IMPLEMENT_TYPE_P (Moment, "moment?");
+IMPLEMENT_SIMPLE_SMOBS (Moment);
+IMPLEMENT_TYPE_P (Moment, "ly:moment?");
 
 SCM
 Moment::mark_smob (SCM)
@@ -23,61 +43,157 @@ Moment::mark_smob (SCM)
   return SCM_EOL;
 }
 
+int
+Moment::print_smob (SCM s, SCM port, scm_print_state *)
+{
+  Moment *r = (Moment *) SCM_CELL_WORD_1 (s);
+
+  scm_puts ("#<Mom ", port);
+  string str = r->to_string ();
+  scm_puts ((char *)str.c_str (), port);
+  scm_puts (">", port);
+
+  return 1;
+}
 
 SCM
-Moment::smobbed_copy () const
+Moment::as_scheme () const
 {
-  Moment * m = new Moment (*this);
-  return m->smobbed_self();
+  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);
+
+  return (*m1 == *m2) ? SCM_BOOL_T : SCM_BOOL_F;
+}
 
 int
-Moment::print_smob (SCM s, SCM port, scm_print_state *)
+compare (Moment const &a, Moment const &b)
 {
-  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 Moment::compare (a, b);
 }
 
-SCM
-make_rational (SCM n, SCM d)
+int
+Moment::compare (Moment const &a, Moment const &b)
 {
-  Moment m (1,1);
+  int c = Rational::compare (a.main_part_, b.main_part_);
+  if (c)
+    return c;
 
-  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");
-    }
+  return Rational::compare (a.grace_part_, b.grace_part_);
+}
 
-  return m.smobbed_copy ();
+void
+Moment::operator += (Moment const &src)
+{
+  main_part_ += src.main_part_;
+  grace_part_ += src.grace_part_;
 }
 
+void
+Moment::operator -= (Moment const &src)
+{
+  main_part_ -= src.main_part_;
+  grace_part_ -= src.grace_part_;
+}
 
+/* Only take the main part of SRC for multiplication.  */
 void
-init_moments ()
+Moment::operator *= (Moment const &src)
 {
-  scm_make_gsubr ("make-moment", 2 , 0, 0, (Scheme_function_unknown) make_rational);
-  scm_make_gsubr ("make-moment", 2 , 0, 0, (Scheme_function_unknown) make_rational);  
+  main_part_ *= src.main_part_;
+  grace_part_ *= src.main_part_;
 }
 
-ADD_SCM_INIT_FUNC(moms,init_moments);
+/* 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_;
+}
 
-SCM
-Moment::equal_p (SCM a, SCM b)
+/* Only take the main part of SRC for division.  */
+void
+Moment::operator %= (Moment const &src)
 {
-  Moment *m1 = unsmob_moment (a);
-  Moment *m2 = unsmob_moment (b);
-      
-  return (*m1 == *m2) ? SCM_BOOL_T : SCM_BOOL_F;
+  main_part_ %= src.main_part_;
+  grace_part_ %= src.main_part_;
+}
+
+I64
+Moment::den () const
+{
+  /* TODO: ensure MSB == 0 here */
+  return main_part_.den ();
+}
+
+I64
+Moment::num () const
+{
+  return main_part_.num ();
+}
+
+bool
+Moment::to_bool () const
+{
+  return main_part_ || grace_part_;
+}
+
+void
+Moment::set_infinite (int k)
+{
+  main_part_.set_infinite (k);
+}
+
+string
+Moment::to_string () const
+{
+  string s = main_part_.to_string ();
+  if (grace_part_)
+    s += "G" + grace_part_.to_string ();
+  return s;
+}
+
+Moment
+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);
 }