X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmoment.cc;h=20c1f58a0b51cdef2e0c5e42e16c4dced7014e7d;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=c892d5f459d4183dc579408b35530d64b2cdd8df;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git

diff --git a/lily/moment.cc b/lily/moment.cc
index c892d5f459..20c1f58a0b 100644
--- a/lily/moment.cc
+++ b/lily/moment.cc
@@ -1,9 +1,20 @@
 /*
-  moment.cc -- implement Moment
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1999--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.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.
+
+  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.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "moment.hh"
@@ -32,24 +43,16 @@ Moment::Moment (Rational 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;
-}
+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;
@@ -59,17 +62,17 @@ 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 ()));
+                     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;
 }
@@ -91,45 +94,51 @@ Moment::compare (Moment const &a, Moment const &b)
 }
 
 void
-Moment::operator+= (Moment const &src)
+Moment::operator += (Moment const &src)
 {
   main_part_ += src.main_part_;
   grace_part_ += src.grace_part_;
 }
+
 void
-Moment::operator-= (Moment const &src)
+Moment::operator -= (Moment const &src)
 {
   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)
+Moment::operator *= (Moment const &src)
 {
   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)
+Moment::operator /= (Moment const &src)
 {
   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 ();
@@ -147,29 +156,27 @@ Moment::set_infinite (int k)
   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
-Moment::operator- () const
+Moment::operator - () const
 {
   Moment m;
   m.grace_part_ = -grace_part_;
-  m. main_part_ = -main_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;
@@ -179,7 +186,7 @@ operator<< (std::ostream &os, Moment const &m)
 Moment
 robust_scm2moment (SCM m, Moment d)
 {
-  Moment *p = unsmob_moment (m);
+  Moment *p = unsmob<Moment> (m);
   if (!p)
     return d;
   else
@@ -189,6 +196,5 @@ robust_scm2moment (SCM m, Moment d)
 bool
 moment_less (SCM a, SCM b)
 {
-  return *unsmob_moment (a) < *unsmob_moment (b);
+  return *unsmob<Moment> (a) < *unsmob<Moment> (b);
 }
-