Run `make grand-replace'.

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

diff --git a/lily/input-smob.cc b/lily/input-smob.cc
index b5b5097b62c8bc096789adba27a603c26e475d45..b6468bcb378a92ed2c33591c7da2a9496c493df2 100644 (file)
--- a/lily/input-smob.cc
+++ b/lily/input-smob.cc
@@ -1,15 +1,15 @@
-/*   
-  input-smob.cc --  implement Input smob
-  
+/*
+  input-smob.cc -- implement Input smob
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 2000--2008 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
 #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.  */
@@ -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,18 @@ 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 ()
@@ -46,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
@@ -54,56 +71,20 @@ make_input (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;                                  
-}
-
-/* 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 #t if @var{x} is an input location.")
-{
-  return unsmob_input (x) ? SCM_BOOL_T : 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"
-          "location in @var{sip}.\n")
-{
-  Input *ip = unsmob_input (sip);
-  SCM_ASSERT_TYPE (ip, sip, SCM_ARG1, __FUNCTION__, "input location");
-  SCM_ASSERT_TYPE (scm_is_string (msg), msg, SCM_ARG2, __FUNCTION__, "string");
-
-  String m = ly_scm2string (msg);
-  ip->message (m);
-
-  return SCM_UNSPECIFIED;
-}
-
-/*
-  TODO: rename this function. ly:input-location? vs ly:input-location
- */
-LY_DEFINE (ly_input_location, "ly:input-location", 1, 0, 0, (SCM sip),
-         "Return input location in @var{sip} as (filename line column).")
-{
-  Input *ip = unsmob_input (sip);
-  SCM_ASSERT_TYPE (ip, sip, SCM_ARG1, __FUNCTION__, "input location");
-  return scm_list_3 (scm_makfrom0str (ip->file_string ().to_str0 ()),
-                    scm_int2num (ip->line_number ()),
-                    scm_int2num (ip->column_number ()));
+    return (Input *) SCM_CDR (s);
+  else
+    return 0;
 }
 
 ADD_SCM_INIT_FUNC (input, start_input_smobs);