X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finput-smob.cc;h=b5b5097b62c8bc096789adba27a603c26e475d45;hb=faaee71fb44c8e1040239797aad336f4e46c2c21;hp=4b6f455a556fb216ce39dbe66b5668eb461971e8;hpb=d8ddee6490dd1bb4965980d3e952a390493bfffd;p=lilypond.git

diff --git a/lily/input-smob.cc b/lily/input-smob.cc
index 4b6f455a55..b5b5097b62 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--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
   
  */
 
@@ -12,6 +12,9 @@
 #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,45 +26,36 @@ 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;
 }
 
-SCM
-ly_input_p (SCM x)
-{
-  return unsmob_input (x) ? SCM_BOOL_T : SCM_BOOL_F ;
-}
 
-static
-void start_input_smobs()
+static void
+start_input_smobs ()
 {
-  input_tag
-    = scm_make_smob_type_mfpe ("input", 0,
-			       mark_smob, free_smob,
-			       print_smob, 0);
-  scm_make_gsubr ("ly-input-location?", 1, 0, 0, (Scheme_function_unknown)ly_input_p);
- 
+  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
 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;
 }
 
@@ -70,15 +64,47 @@ 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;					
 }
 
+/* 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 #t if @var{x} is an input location.")
+{
+  return unsmob_input (x) ? SCM_BOOL_T : SCM_BOOL_F;
+}
 
-ADD_SCM_INIT_FUNC(input, 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}.\n")
+{
+  Input *ip = unsmob_input (sip);
+  SCM_ASSERT_TYPE (ip, sip, SCM_ARG1, __FUNCTION__, "input location");
+  SCM_ASSERT_TYPE (scm_is_string (msg), msg, SCM_ARG2, __FUNCTION__, "string");
 
+  String m = ly_scm2string (msg);
+  ip->message (m);
 
-Input dummy_input_global;
+  return SCM_UNSPECIFIED;
+}
+
+/*
+  TODO: rename this function. ly:input-location? vs ly:input-location
+ */
+LY_DEFINE (ly_input_location, "ly:input-location", 1, 0, 0, (SCM sip),
+	  "Return input location in @var{sip} as (filename line column).")
+{
+  Input *ip = unsmob_input (sip);
+  SCM_ASSERT_TYPE (ip, sip, SCM_ARG1, __FUNCTION__, "input location");
+  return scm_list_3 (scm_makfrom0str (ip->file_string ().to_str0 ()),
+		     scm_int2num (ip->line_number ()),
+		     scm_int2num (ip->column_number ()));
+}
+
+ADD_SCM_INIT_FUNC (input, start_input_smobs);