X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fspring-smob.cc;h=19a5eef4c5ff87ffc4fc18a84f2f0af14fce3286;hb=5d84bfad4626892bcffd05adcced53c8a2329047;hp=8e3ce16640914d0df892738b197a210855c6129e;hpb=e24fb7cc5671aea95211d4a0c56f28fb6fe8720e;p=lilypond.git

diff --git a/lily/spring-smob.cc b/lily/spring-smob.cc
index 8e3ce16640..19a5eef4c5 100644
--- a/lily/spring-smob.cc
+++ b/lily/spring-smob.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1999--2014 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
@@ -19,27 +19,15 @@
 
 #include "spring.hh"
 #include "warn.hh"
-#include "ly-smobs.icc"
 
-IMPLEMENT_SIMPLE_SMOBS (Spring);
 
-SCM
-Spring::mark_smob (SCM)
-{
-  return SCM_UNSPECIFIED;
-}
 
-int
-Spring::print_smob (SCM, SCM p, scm_print_state *)
-{
-  scm_puts ("#<Spring smob>", p);
-  return 1;
-}
 
 SCM
 Spring::equal_p (SCM a, SCM b)
 {
-  return a == b ? SCM_BOOL_T : SCM_BOOL_F;
+  // TODO SCM: This could be made simpler.
+  return scm_is_eq (a, b) ? SCM_BOOL_T : SCM_BOOL_F;
 }
 
 LY_DEFINE (ly_make_spring, "ly:make-spring",
@@ -62,7 +50,7 @@ LY_DEFINE (ly_spring_set_inverse_compress_strength_x, "ly:spring-set-inverse-com
   LY_ASSERT_SMOB (Spring, spring, 1);
   LY_ASSERT_TYPE (scm_is_number, strength, 2);
 
-  Spring *s = unsmob_spring (spring);
+  Spring *s = unsmob<Spring> (spring);
   s->set_inverse_compress_strength (scm_to_double (strength));
   return s->smobbed_copy ();
 }
@@ -74,9 +62,9 @@ LY_DEFINE (ly_spring_set_inverse_stretch_strength_x, "ly:spring-set-inverse-stre
   LY_ASSERT_SMOB (Spring, spring, 1);
   LY_ASSERT_TYPE (scm_is_number, strength, 2);
 
-  Spring *s = unsmob_spring (spring);
+  Spring *s = unsmob<Spring> (spring);
   s->set_inverse_stretch_strength (scm_to_double (strength));
   return s->smobbed_copy ();
 }
 
-IMPLEMENT_TYPE_P (Spring, "ly:spring?");
+const char * const Spring::type_p_name_ = "ly:spring?";