X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fmoment.cc;h=20c1f58a0b51cdef2e0c5e42e16c4dced7014e7d;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=1a646b9735ce08eb9fb9b11035d812da5db1c010;hpb=2e8af646c57285dc4946205ddab0257bc4ef6270;p=lilypond.git

diff --git a/lily/moment.cc b/lily/moment.cc
index 1a646b9735..20c1f58a0b 100644
--- a/lily/moment.cc
+++ b/lily/moment.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1999--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1999--2015 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
@@ -43,24 +43,15 @@ Moment::Moment (Rational m)
   grace_part_ = Rational (0);
 }
 
-#include "ly-smobs.icc"
 
-IMPLEMENT_SIMPLE_SMOBS (Moment);
-IMPLEMENT_TYPE_P (Moment, "ly:moment?");
+const char * const Moment::type_p_name_ = "ly:moment?";
 
-SCM
-Moment::mark_smob (SCM)
-{
-  return SCM_EOL;
-}
 
 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 ();
+  string str = to_string ();
   scm_puts ((char *)str.c_str (), port);
   scm_puts (">", port);
 
@@ -71,17 +62,17 @@ SCM
 Moment::as_scheme () const
 {
   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_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;
 }
@@ -159,18 +150,6 @@ Moment::to_bool () const
   return main_part_ || grace_part_;
 }
 
-Rational
-Moment::main_part () const
-{
-  return main_part_;
-}
-
-Rational
-Moment::grace_part () const
-{
-  return grace_part_;
-}
-
 void
 Moment::set_infinite (int k)
 {
@@ -207,7 +186,7 @@ operator << (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
@@ -217,5 +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);
 }