The last commit was an accident. Revert 3 files that shouldn't have been

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

diff --git a/lily/input-smob.cc b/lily/input-smob.cc
index 0e585afa5e644fe0be8f98d151c885e5d3dfdc13..7f66bcd3d3ec13ba84e79d96d75da05a5b314ac6 100644 (file)
--- a/lily/input-smob.cc
+++ b/lily/input-smob.cc
@@ -1,15 +1,14 @@
-/*   
-  input-smob.cc --  implement Input smob
-  
+/*
+  input-smob.cc -- implement Input smob
+
   source file of the GNU LilyPond music typesetter
-  
-  (c) 2000--2005 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
 
-#include "input-smob.hh"
+  (c) 2000--2006 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
 
-#include "string.hh"
+#include "input.hh"
+#include "source-file.hh"
+#include "std-string.hh"
 
 #include "ly-smobs.icc"
 
@@ -19,16 +18,21 @@ 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_string () + ">";
-  scm_puts (str.to_str0 (), port);
+  string str = "#<location " + unsmob_input (s)->location_string () + ">";
+  scm_puts (str.c_str (), port);
   return 1;
 }
 
@@ -39,7 +43,6 @@ free_smob (SCM s)
   return 0;
 }
 
-
 static void
 start_input_smobs ()
 {
@@ -55,22 +58,21 @@ 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;                                  
+    return (Input *) SCM_CDR (s);
+  else
+    return 0;
 }
 
-
 ADD_SCM_INIT_FUNC (input, start_input_smobs);