X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finput-scheme.cc;h=a324ccf0f4f747441febe98455cc3f49c7a2ff66;hb=47db9a3883d726ca53e2133a3b2298f78dd6a32e;hp=f8bef3bda8aa930e66d915e5e877409d6df2e7c4;hpb=82e1242e3ad5d276b74e81488a3ffdac25701520;p=lilypond.git diff --git a/lily/input-scheme.cc b/lily/input-scheme.cc index f8bef3bda8..a324ccf0f4 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--2014 Han-Wen Nienhuys + Copyright (C) 2005--2015 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 @@ -27,7 +27,7 @@ LY_DEFINE (ly_input_warning, "ly:input-warning", 2, 0, 1, (SCM sip, SCM msg, SCM { Input *ip = Input::unsmob (sip); - LY_ASSERT_TYPE (Input::unsmob, sip, 1); + LY_ASSERT_SMOB (Input, sip, 1); LY_ASSERT_TYPE (scm_is_string, msg, 2); msg = scm_simple_format (SCM_BOOL_F, msg, rest); @@ -45,7 +45,7 @@ LY_DEFINE (ly_input_message, "ly:input-message", 2, 0, 1, (SCM sip, SCM msg, SCM { Input *ip = Input::unsmob (sip); - LY_ASSERT_TYPE (Input::unsmob, sip, 1); + LY_ASSERT_SMOB (Input, sip, 1); LY_ASSERT_TYPE (scm_is_string, msg, 2); msg = scm_simple_format (SCM_BOOL_F, msg, rest); @@ -62,7 +62,7 @@ LY_DEFINE (ly_input_file_line_char_column, "Return input location in @var{sip} as" " @code{(file-name line char column)}.") { - LY_ASSERT_TYPE (Input::unsmob, sip, 1); + LY_ASSERT_SMOB (Input, sip, 1); Input *ip = Input::unsmob (sip); int l, ch, col, offset = 0; @@ -80,7 +80,7 @@ LY_DEFINE (ly_input_both_locations, " @code{(file-name first-line first-column last-line last-column)}.") { - LY_ASSERT_TYPE (Input::unsmob, sip, 1); + LY_ASSERT_SMOB (Input, sip, 1); Input *ip = Input::unsmob (sip); return scm_list_5 (ly_string2scm (ip->file_string ()),