X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finput-smob.cc;h=716c41d7137d094f076addc8156d3882ae05ca57;hb=e90f0536f9be39ada0bef0aeb0d275dec3b2fb5b;hp=929db6dddd977a5b78ec5a9d6535aac226bca52d;hpb=7aabfb20c46e0a1de41698ddc6859ccd3a6dea85;p=lilypond.git

diff --git a/lily/input-smob.cc b/lily/input-smob.cc
index 929db6dddd..716c41d713 100644
--- a/lily/input-smob.cc
+++ b/lily/input-smob.cc
@@ -1,30 +1,49 @@
-/*   
-  input-smob.cc --  implement Input smob
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 2000--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+/*
+  This file is part of LilyPond, the GNU music typesetter.
+
+  Copyright (C) 2000--2011 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"
-#include "input-smob.hh"
-#include "string.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;
 
-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;
 }
 
@@ -35,34 +54,19 @@ free_smob (SCM s)
   return 0;
 }
 
-/*
-  We don't use IMPLEMENT_TYPE_P, since the smobification part is
-  implemented separately from the class.
- */
-LY_DEFINE(ly_input, "ly:input-location?", 1, 0, 0,
-	  (SCM x),
-	  "Return whether @var{x} is an input location")
+static SCM
+equal_smob (SCM sa, SCM sb)
 {
-  return unsmob_input (x) ? SCM_BOOL_T : SCM_BOOL_F ;
+  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;
 }
 
-LY_DEFINE(ly_input_message,  "ly:input-message", 2, 0, 0, (SCM sip, SCM msg),
-	  "Print @var{msg} as a GNU compliant error message, pointing to the\n"
-	  "location in @var{sip}.\n"
-	  )
-{
-  Input *ip  = unsmob_input(sip);
-  
-  SCM_ASSERT_TYPE(ip, sip, SCM_ARG1, __FUNCTION__, "input location");
-  SCM_ASSERT_TYPE(gh_string_p (msg), msg, SCM_ARG2, __FUNCTION__, "string");
-
-  String m = ly_scm2string (msg);
-
-  ip->message (m);
-  return SCM_UNDEFINED;
-}
-
-
 static void
 start_input_smobs ()
 {
@@ -70,33 +74,29 @@ 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
 make_input (Input ip)
 {
-  Input * nip =  new Input (ip);
+  Input *nip = new Input (ip);
   SCM z;
-  
+
   SCM_NEWSMOB (z, input_tag, nip);
   return z;
 }
 
-Input *						
+Input *
 unsmob_input (SCM s)
 {
   if (SCM_IMP (s))
     return 0;
   if (SCM_CAR (s) == (SCM)input_tag) // ugh.
-    return (Input*) SCM_CDR (s);
-  else						
-    return 0;					
+    return (Input *) SCM_CDR (s);
+  else
+    return 0;
 }
 
-
 ADD_SCM_INIT_FUNC (input, start_input_smobs);
 
-
-Input dummy_input_global;
-