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 "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
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;
}
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 ()
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;
}
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);