2002-07-13 Han-Wen <hanwen@cs.uu.nl>

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

diff --git a/lily/input-smob.cc b/lily/input-smob.cc
index bd7061a3d08405ad0c43e5988ad77a1eaaa204ee..0ea9b3664c434f87809e9b9a1c70e4835b6d7ec2 100644 (file)
--- a/lily/input-smob.cc
+++ b/lily/input-smob.cc
@@ -3,7 +3,7 @@
   
   source file of the GNU LilyPond music typesetter
   
-  (c) 2000--2001 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  (c) 2000--2002 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -35,14 +35,35 @@ free_smob (SCM s)
   return 0;
 }
 
-SCM
-ly_input_p (SCM x)
+/*
+  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 ;
 }
 
-static
-void start_input_smobs ()
+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 ()
 {
   input_tag = scm_make_smob_type ("input", 0);
   scm_set_smob_mark (input_tag, mark_smob);
@@ -50,9 +71,8 @@ void start_input_smobs ()
   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)
@@ -60,10 +80,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;
 }