* 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 bbd6f34dc3144995680c20c3754f0b54ecadc399..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,32 +39,6 @@ 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_p, "ly-input-location?", 1, 0, 0,
-         (SCM x),
-         "Return whether @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}.")
-{
-  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,20 +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
 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;
 }
 
@@ -101,6 +74,3 @@ unsmob_input (SCM s)
 
 ADD_SCM_INIT_FUNC (input, start_input_smobs);
 
-
-Input dummy_input_global;
-