-/*
- 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 (file-name line column).")
+
+LY_DEFINE (ly_input_file_line_char_column,
+ "ly:input-file-line-char-column",
+ 1, 0, 0, (SCM sip),
+ "Return input location in @var{sip} as"
+ " @code{(file-name line char column)}.")
+{
+ LY_ASSERT_TYPE (unsmob_input, sip, 1);
+ Input *ip = unsmob_input (sip);
+
+ int l, ch, col, offset = 0;
+ ip->get_counts (&l, &ch, &col, &offset);
+ return scm_list_4 (ly_string2scm (ip->file_string ()),
+ scm_from_int (l),
+ scm_from_int (ch),
+ scm_from_int (col));
+}
+
+LY_DEFINE (ly_input_both_locations,
+ "ly:input-both-locations",
+ 1, 0, 0, (SCM sip),
+ "Return input location in @var{sip} as"
+ " @code{(file-name first-line first-column last-line last-column)}.")