X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fstream-event-scheme.cc;h=04df26a7220c573c9532ef01d9e12ee8c704f801;hb=dcbe4187b56ee3f420c3ad81bad54e8406c727e8;hp=e6e4fb7dc60faaac59ae85c6354dd8d43a340aa2;hpb=f9214bac21e9926dc3248416f58190c98c4167a9;p=lilypond.git

diff --git a/lily/stream-event-scheme.cc b/lily/stream-event-scheme.cc
index e6e4fb7dc6..04df26a722 100644
--- 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_TYPE (ly_is_symbol, cl, 1);
 
   /* 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, proplist, 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_SMOB (Stream_event, sev, 1);
+  LY_ASSERT_TYPE (ly_is_symbol, sym, 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, "ly:event-set-property!",
+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_SMOB (Stream_event, ev, 1);
+  LY_ASSERT_TYPE (ly_is_symbol, sym, 2);
+  
   return ly_prob_set_property_x (ev, sym, val);
 }