X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmoment.cc;h=adcecff767140095dd22e5fbb5aa3d8a5453fdb5;hb=5bbfc22fce036b9b69df5e420de93e11da23c05e;hp=3a5aa6832366df8d94c80d71cd4cf3d5c69ed876;hpb=5d1ddaf889233f8e5c32a118f9e843e1becca2d2;p=lilypond.git

diff --git a/lily/moment.cc b/lily/moment.cc
index 3a5aa68323..adcecff767 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.
+
+  Copyright (C) 1999--2014 Han-Wen Nienhuys <hanwen@xs4all.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.
 
-  source file of the GNU LilyPond music typesetter
+  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.
 
-  (c) 1999--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  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"
@@ -17,7 +28,7 @@ Moment::Moment ()
 Moment::Moment (int m)
 {
   main_part_ = Rational (m);
-  grace_part_ = Rational ( 0);
+  grace_part_ = Rational (0);
 }
 
 Moment::Moment (Rational m, Rational g)
@@ -33,6 +44,7 @@ Moment::Moment (Rational m)
 }
 
 #include "ly-smobs.icc"
+
 IMPLEMENT_SIMPLE_SMOBS (Moment);
 IMPLEMENT_TYPE_P (Moment, "ly:moment?");
 
@@ -45,13 +57,13 @@ Moment::mark_smob (SCM)
 int
 Moment::print_smob (SCM s, SCM port, scm_print_state *)
 {
-  Moment  *r = (Moment *) SCM_CELL_WORD_1 (s);
-     
+  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 = r->to_string ();
+  scm_puts ((char *)str.c_str (), port);
   scm_puts (">", port);
-  
+
   return 1;
 }
 
@@ -59,19 +71,18 @@ 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 = Moment::unsmob (a);
+  Moment *m2 = Moment::unsmob (b);
+
   return (*m1 == *m2) ? SCM_BOOL_T : SCM_BOOL_F;
 }
 
@@ -94,43 +105,49 @@ Moment::compare (Moment const &a, Moment const &b)
 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_;
 }
 
-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 ();
@@ -148,14 +165,12 @@ 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;
 }
 
@@ -163,15 +178,14 @@ Moment
 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)
+ostream &
+operator << (ostream &os, Moment const &m)
 {
   os << m.to_string ();
   return os;
@@ -181,17 +195,16 @@ operator << (std::ostream &os, Moment const &m)
 Moment
 robust_scm2moment (SCM m, Moment d)
 {
-  Moment *p = unsmob_moment (m);
+  Moment *p = Moment::unsmob (m);
   if (!p)
     return d;
   else
     return *p;
 }
 
-
 bool
 moment_less (SCM a, SCM b)
 {
-  return *unsmob_moment (a) < *unsmob_moment (b);
+  return *Moment::unsmob (a) < *Moment::unsmob (b);
 }