Merge branch 'issue4032'

[lilypond.git] / lily / input-smob.cc

diff --git a/lily/input-smob.cc b/lily/input-smob.cc
index 7f66bcd3d3ec13ba84e79d96d75da05a5b314ac6..07748ad48f5e4c9d4f270a04b540e32871deb942 100644 (file)
--- a/lily/input-smob.cc
+++ b/lily/input-smob.cc
@@ -1,9 +1,20 @@
 /*
-  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--2014 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.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "input.hh"
@@ -17,8 +28,8 @@ Input dummy_input_global;
 
 static long input_tag;
 
-static
-SCM mark_smob (SCM s)
+static SCM
+mark_smob (SCM s)
 {
   Input *sc = (Input *) SCM_CELL_WORD_1 (s);
 
@@ -31,7 +42,7 @@ SCM mark_smob (SCM s)
 static int
 print_smob (SCM s, SCM port, scm_print_state *)
 {
-  string str = "#<location " + unsmob_input (s)->location_string () + ">";
+  string str = "#<location " + Input::unsmob (s)->location_string () + ">";
   scm_puts (str.c_str (), port);
   return 1;
 }
@@ -39,10 +50,23 @@ print_smob (SCM s, SCM port, scm_print_state *)
 static size_t
 free_smob (SCM s)
 {
-  delete unsmob_input (s);
+  delete Input::unsmob (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 ()
 {
@@ -50,7 +74,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
@@ -64,7 +88,7 @@ make_input (Input ip)
 }
 
 Input *
-unsmob_input (SCM s)
+Input::unsmob (SCM s)
 {
   if (SCM_IMP (s))
     return 0;