X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finput-smob.cc;h=6f5fc18a54fb116a58dc2c1db13cf227c472704c;hb=90e4d7057f3857da049dfda3d130017d4719bd6b;hp=00c93305e783949c9cae23263ecb0d68c829669e;hpb=8a719f6eec1bd84269a55d1ec99adb3f17c04e64;p=lilypond.git

diff --git a/lily/input-smob.cc b/lily/input-smob.cc
index 00c93305e7..6f5fc18a54 100644
--- a/lily/input-smob.cc
+++ b/lily/input-smob.cc
@@ -1,73 +1,58 @@
 /*
-  input-smob.cc -- implement Input smob
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 2000--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 2000--2006 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.
+
+  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.
 
-#include "input-smob.hh"
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
-#include "string.hh"
+#include "input.hh"
+#include "source-file.hh"
+#include "std-string.hh"
 
-#include "ly-smobs.icc"
 
 /* Dummy input location for use if real one is missing.  */
 Input dummy_input_global;
 
-static long input_tag;
+const char * const Input::type_p_name_ = "ly:input-location?";
 
-static
-SCM mark_smob (SCM)
+SCM
+Input::mark_smob () const
 {
+  if (Source_file *sf = get_source_file ())
+    return sf->self_scm ();
+
   return SCM_EOL;
 }
 
-static int
-print_smob (SCM s, SCM port, scm_print_state *)
+int
+Input::print_smob (SCM port, scm_print_state *) const
 {
-  String str = "#<location " + unsmob_input (s)->location_string () + ">";
+  string str = "#<location " + location_string () + ">";
   scm_puts (str.c_str (), port);
   return 1;
 }
 
-static size_t
-free_smob (SCM s)
-{
-  delete unsmob_input (s);
-  return 0;
-}
-
-static void
-start_input_smobs ()
-{
-  input_tag = scm_make_smob_type ("input", 0);
-  scm_set_smob_mark (input_tag, mark_smob);
-  scm_set_smob_free (input_tag, free_smob);
-  scm_set_smob_print (input_tag, print_smob);
-  scm_set_smob_equalp (input_tag, 0);
-}
-
 SCM
-make_input (Input ip)
-{
-  Input *nip = new Input (ip);
-  SCM z;
-
-  SCM_NEWSMOB (z, input_tag, nip);
-  return z;
-}
-
-Input *
-unsmob_input (SCM s)
+Input::equal_p (SCM sa, SCM sb)
 {
-  if (SCM_IMP (s))
-    return 0;
-  if (SCM_CAR (s) == (SCM)input_tag) // ugh.
-    return (Input *) SCM_CDR (s);
+  Input *a = unsmob<Input> (sa);
+  Input *b = unsmob<Input> (sb);
+  if (a->get_source_file () == b->get_source_file ()
+      && a->start () == b->start ()
+      && a->end () == b->end ())
+    return SCM_BOOL_T;
   else
-    return 0;
+    return SCM_BOOL_F;
 }
-
-ADD_SCM_INIT_FUNC (input, start_input_smobs);
-