X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finput-smob.cc;h=7f66bcd3d3ec13ba84e79d96d75da05a5b314ac6;hb=f354ae4e1a6dab6ad4b1a98c2d732f542a05a02e;hp=5b6ad8b779604e1ccf5b0f4bd51441ef20f2c648;hpb=fc3e875d6bf06f0680e897faffdcab36ad975a03;p=lilypond.git

diff --git a/lily/input-smob.cc b/lily/input-smob.cc
index 5b6ad8b779..7f66bcd3d3 100644
--- a/lily/input-smob.cc
+++ b/lily/input-smob.cc
@@ -1,84 +1,78 @@
-/*   
-  input-smob.cc --  implement Input smob
-  
+/*
+  input-smob.cc -- implement Input smob
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
+
+  (c) 2000--2006 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.  */
+Input dummy_input_global;
+
 static long input_tag;
 
 static
-SCM mark_smob (SCM)
+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_str () + ">";
-  scm_puts (str.ch_C (), port);
+  string str = "#<location " + unsmob_input (s)->location_string () + ">";
+  scm_puts (str.c_str (), port);
   return 1;
 }
 
-static
-scm_sizet free_smob (SCM s)
+static size_t
+free_smob (SCM s)
 {
   delete unsmob_input (s);
   return 0;
 }
 
-SCM
-ly_input_p (SCM x)
+static void
+start_input_smobs ()
 {
-  return unsmob_input (x) ? SCM_BOOL_T : SCM_BOOL_F ;
-}
-
-static
-void start_input_smobs ()
-{
-  input_tag
-    = scm_make_smob_type_mfpe ("input", 0,
-			       mark_smob, free_smob,
-			       print_smob, 0);
-  scm_make_gsubr ("ly-input-location?", 1, 0, 0, (Scheme_function_unknown)ly_input_p);
- 
+  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);
+  Input *nip = new Input (ip);
   SCM z;
-  
-  SCM_NEWCELL (z);
-  SCM_SETCAR (z, (SCM)input_tag);
-  SCM_SETCDR (z, (SCM)nip);
-				// fixme: done_malloc
+
+  SCM_NEWSMOB (z, input_tag, nip);
   return z;
 }
 
-Input *						
+Input *
 unsmob_input (SCM s)
 {
   if (SCM_IMP (s))
     return 0;
-  if ((long)SCM_CAR (s) == input_tag) // ugh.
-    return (Input*) SCM_CDR (s);
-  else						
-    return 0;					
+  if (SCM_CAR (s) == (SCM)input_tag) // ugh.
+    return (Input *) SCM_CDR (s);
+  else
+    return 0;
 }
 
-
 ADD_SCM_INIT_FUNC (input, start_input_smobs);
 
-
-Input dummy_input_global;
-