replace SCM_ASSERT_TYPE with LY_ASSERT_TYPE and friends

[lilypond.git] / lily / stream-event-scheme.cc

diff --git a/lily/stream-event-scheme.cc b/lily/stream-event-scheme.cc
index c44d24a5779a52344d3da65e53ad176d1124655b..0a4dc71522609ae888a06688669154b9dda7badd 100644 (file)
--- a/lily/stream-event-scheme.cc
+++ b/lily/stream-event-scheme.cc
@@ -12,10 +12,10 @@ LY_DEFINE (ly_make_stream_event, "ly:make-stream-event",
           1, 1, 0, (SCM cl, SCM proplist),
           "Creates a stream event of class @var{cl} with the given mutable property list.\n" )
 {
-  SCM_ASSERT_TYPE (scm_is_symbol (cl), cl, SCM_ARG1, __FUNCTION__, "symbol");
+  LY_ASSERT_FIRST_TYPE (ly_is_symbol, cl);
 
   /* should be scm_list_p, but scm_list_p is expensive. */
-  SCM_ASSERT_TYPE (scm_is_pair (proplist), proplist, SCM_ARG2, __FUNCTION__, "association list");
+  LY_ASSERT_TYPE(scm_is_pair, 2);
   
   if (proplist == SCM_UNDEFINED)
     proplist = SCM_EOL;
@@ -29,18 +29,21 @@ LY_DEFINE (ly_event_property, "ly:event-property",
           "Get the property @var{sym} of stream event @var{mus}.\n"
           "If @var{sym} is undefined, return @code{'()}.\n")
 {
+  LY_ASSERT_FIRST_SMOB (Stream_event, sev);
+  LY_ASSERT_TYPE (ly_is_symbol, 2);
+
   Stream_event *e = unsmob_stream_event (sev);
-  SCM_ASSERT_TYPE (e, sev, SCM_ARG1, __FUNCTION__, "stream event");
-  SCM_ASSERT_TYPE (scm_is_symbol (sym), sym, SCM_ARG2, __FUNCTION__, "symbol");
 
   return e->internal_get_property (sym);
 }
 
 LY_DEFINE (ly_event_set_property_x, "ly:event-set-property!",
            3, 0, 0, (SCM ev, SCM sym, SCM val),
-           "Set property @var{sym} in event @var{ev} to @var{val}."){
-  Stream_event *sc = unsmob_stream_event (ev);
-  SCM_ASSERT_TYPE (sc, ev, SCM_ARG1, __FUNCTION__, "event");
+           "Set property @var{sym} in event @var{ev} to @var{val}.")
+{
+  LY_ASSERT_FIRST_SMOB (Stream_event, ev);
+  LY_ASSERT_TYPE (ly_is_symbol, 2);
+  
   return ly_prob_set_property_x (ev, sym, val);
 }