- Input *ip = unsmob_input (sip);
- SCM_ASSERT_TYPE (ip, sip, SCM_ARG1, __FUNCTION__, "input location");
- return scm_list_5 (scm_makfrom0str (ip->file_string ().to_str0 ()),
- scm_int2num (ip->line_number ()),
- scm_int2num (ip->column_number ()),
- scm_int2num (ip->end_line_number ()),
- scm_int2num (ip->end_column_number ()));
+
+ LY_ASSERT_SMOB (Input, sip, 1);
+ Input *ip = Input::unsmob (sip);
+
+ return scm_list_5 (ly_string2scm (ip->file_string ()),
+ scm_from_int (ip->line_number ()),
+ scm_from_int (ip->column_number ()),
+ scm_from_int (ip->end_line_number ()),
+ scm_from_int (ip->end_column_number ()));