X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finput-smob.cc;h=0f928a67b763776ea024941b4b14db7a425b8ee9;hb=d558a989232668d7a9af43385a35deb810ec008a;hp=a543f52a9be25a5541d2fd38bb3bc02141015cd4;hpb=58bcc84c9480dae1b21bc24d8396b91fe19e0131;p=lilypond.git

diff --git a/lily/input-smob.cc b/lily/input-smob.cc
index a543f52a9b..0f928a67b7 100644
--- a/lily/input-smob.cc
+++ b/lily/input-smob.cc
@@ -3,12 +3,12 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2007 Han-Wen Nienhuys <hanwen@xs4all.nl>
 */
 
-#include "input-smob.hh"
-
-#include "string.hh"
+#include "input.hh"
+#include "source-file.hh"
+#include "std-string.hh"
 
 #include "ly-smobs.icc"
 
@@ -17,17 +17,22 @@ Input dummy_input_global;
 
 static long input_tag;
 
-static
-SCM mark_smob (SCM)
+static SCM
+mark_smob (SCM s)
 {
+  Input *sc = (Input *) SCM_CELL_WORD_1 (s);
+
+  if (Source_file *sf = sc->get_source_file ())
+    return sf->self_scm ();
+
   return SCM_EOL;
 }
 
 static int
 print_smob (SCM s, SCM port, scm_print_state *)
 {
-  String str = "#<location " + unsmob_input (s)->location_string () + ">";
-  scm_puts (str.to_str0 (), port);
+  string str = "#<location " + unsmob_input (s)->location_string () + ">";
+  scm_puts (str.c_str (), port);
   return 1;
 }
 
@@ -38,6 +43,19 @@ free_smob (SCM s)
   return 0;
 }
 
+static SCM
+equal_smob (SCM sa, SCM sb)
+{
+  Input *a = (Input *) SCM_CELL_WORD_1 (sa);
+  Input *b = (Input *) SCM_CELL_WORD_1 (sb);
+  if (a->get_source_file () == b->get_source_file () &&
+      a->start () == b->start () &&
+      a->end () == b->end ())
+    return SCM_BOOL_T;
+  else
+    return SCM_BOOL_F;
+}
+
 static void
 start_input_smobs ()
 {
@@ -45,7 +63,7 @@ start_input_smobs ()
   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_set_smob_equalp (input_tag, equal_smob);
 }
 
 SCM