* lily/general-scheme.cc (LY_DEFINE): Use snprintf (WAS: sprintf).

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

diff --git a/lily/input-smob.cc b/lily/input-smob.cc
index fd904b25be6cd88d3f2d42f94cdb0bc82292622f..8dbf4d87f987ca3e2b17500e45557f5ae5ea4086 100644 (file)
--- a/lily/input-smob.cc
+++ b/lily/input-smob.cc
@@ -3,15 +3,19 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
-#include "input.hh"
 #include "input-smob.hh"
+
 #include "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
@@ -23,8 +27,8 @@ SCM mark_smob (SCM)
 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.to_str0 (), port);
   return 1;
 }
 
@@ -35,11 +39,6 @@ free_smob (SCM s)
   return 0;
 }
 
-SCM
-ly_input_p (SCM x)
-{
-  return unsmob_input (x) ? SCM_BOOL_T : SCM_BOOL_F ;
-}
 
 static void
 start_input_smobs ()
@@ -49,21 +48,15 @@ start_input_smobs ()
   scm_set_smob_free (input_tag, free_smob);
   scm_set_smob_print (input_tag, print_smob);
   scm_set_smob_equalp (input_tag, 0);
-
-  scm_c_define_gsubr ("ly-input-location?", 1, 0, 0,
-                     (Scheme_function_unknown)ly_input_p);
 }
 
 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;
 }
 
@@ -81,6 +74,3 @@ unsmob_input (SCM s)
 
 ADD_SCM_INIT_FUNC (input, start_input_smobs);
 
-
-Input dummy_input_global;
-