X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finput-scheme.cc;h=1325c8e1514e2fa76852d7eb45fe181b314e04f2;hb=4a401ca1c60f428daa242dbdd102fdb3f327ebfb;hp=d3e2d65803e03ccc68b24342ebbb3eeca7a9e027;hpb=bc95f4434f760d41191341ab4508b2064eb19025;p=lilypond.git diff --git a/lily/input-scheme.cc b/lily/input-scheme.cc index d3e2d65803..1325c8e151 100644 --- a/lily/input-scheme.cc +++ b/lily/input-scheme.cc @@ -1,7 +1,7 @@ /* This file is part of LilyPond, the GNU music typesetter. - Copyright (C) 2005--2010 Han-Wen Nienhuys + Copyright (C) 2005--2011 Han-Wen Nienhuys LilyPond is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,21 +23,21 @@ /* We don't use IMPLEMENT_TYPE_P, since the smobification part is implemented separately from the class. */ LY_DEFINE (ly_input_location_p, "ly:input-location?", 1, 0, 0, - (SCM x), - "Is @var{x} an @code{input-location}?") + (SCM x), + "Is @var{x} an @code{input-location}?") { return unsmob_input (x) ? SCM_BOOL_T : SCM_BOOL_F; } LY_DEFINE (ly_input_message, "ly:input-message", 2, 0, 1, (SCM sip, SCM msg, SCM rest), - "Print @var{msg} as a GNU compliant error message, pointing" - " to the location in @var{sip}. @var{msg} is interpreted" - " similar to @code{format}'s argument, using @var{rest}.") + "Print @var{msg} as a GNU compliant error message, pointing" + " to the location in @var{sip}. @var{msg} is interpreted" + " similar to @code{format}'s argument, using @var{rest}.") { Input *ip = unsmob_input (sip); LY_ASSERT_TYPE (unsmob_input, sip, 1); - LY_ASSERT_TYPE (scm_is_string, msg,2); + LY_ASSERT_TYPE (scm_is_string, msg, 2); msg = scm_simple_format (SCM_BOOL_F, msg, rest); @@ -47,12 +47,11 @@ LY_DEFINE (ly_input_message, "ly:input-message", 2, 0, 1, (SCM sip, SCM msg, SCM return SCM_UNSPECIFIED; } - 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: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); @@ -60,24 +59,24 @@ LY_DEFINE (ly_input_file_line_char_column, 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)); + 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)}.") + "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)}.") { - + LY_ASSERT_TYPE (unsmob_input, sip, 1); Input *ip = unsmob_input (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 ())); + 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 ())); }