X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finput-smob.cc;h=929db6dddd977a5b78ec5a9d6535aac226bca52d;hb=aab300b4e582627497ab12f8ea8609f03a3c8d84;hp=2a9927db8697cf3a7360170640c4538bcde0c5bb;hpb=01d6763cea8e4890874001a2f756ba2162e4262f;p=lilypond.git

diff --git a/lily/input-smob.cc b/lily/input-smob.cc
index 2a9927db86..929db6dddd 100644
--- a/lily/input-smob.cc
+++ b/lily/input-smob.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2003 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -23,25 +23,54 @@ 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;
 }
 
-static
-scm_sizet free_smob (SCM s)
+static size_t
+free_smob (SCM s)
 {
   delete unsmob_input (s);
   return 0;
 }
 
-static
-void start_input_smobs()
+/*
+  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 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\n"
+	  "location in @var{sip}.\n"
+	  )
+{
+  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 ()
 {
-  input_tag
-    = scm_make_smob_type_mfpe ("input", 0,
-			       mark_smob, free_smob,
-			       print_smob, 0);
+  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
@@ -50,10 +79,7 @@ make_input (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;
 }
 
@@ -62,14 +88,15 @@ unsmob_input (SCM s)
 {
   if (SCM_IMP (s))
     return 0;
-  if ((long)SCM_CAR(s) == input_tag) // ugh.
-    return (Input*) SCM_CDR(s);
+  if (SCM_CAR (s) == (SCM)input_tag) // ugh.
+    return (Input*) SCM_CDR (s);
   else						
     return 0;					
 }
 
 
-ADD_SCM_INIT_FUNC(input, start_input_smobs);
+ADD_SCM_INIT_FUNC (input, start_input_smobs);
 
 
 Input dummy_input_global;
+