From b2be67b5ee9ab0004d609acc5b2ca3b496a305c9 Mon Sep 17 00:00:00 2001 From: David Kastrup Date: Thu, 13 Dec 2012 16:04:59 +0100 Subject: [PATCH] Issue 3019: Let ly:event-property take an optional default argument This is analogous to the respective functionality for ly:music-property and ly:prob-property. --- lily/stream-event-scheme.cc | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/lily/stream-event-scheme.cc b/lily/stream-event-scheme.cc index 8a83f499e2..16703d33f5 100644 --- a/lily/stream-event-scheme.cc +++ b/lily/stream-event-scheme.cc @@ -44,16 +44,13 @@ LY_DEFINE (ly_make_stream_event, "ly:make-stream-event", } LY_DEFINE (ly_event_property, "ly:event-property", - 2, 0, 0, (SCM sev, SCM sym), - "Get the property @var{sym} of stream event @var{mus}." - " If @var{sym} is undefined, return @code{'()}.") + 2, 1, 0, (SCM sev, SCM sym, SCM val), + "Get the property @var{sym} of stream event @var{sev}." + " If @var{sym} is undefined, return @var{val} or" + " @code{'()} if @var{val} is not specified.") { - LY_ASSERT_TYPE (unsmob_stream_event, sev, 1); - LY_ASSERT_TYPE (ly_is_symbol, sym, 2); - - Stream_event *e = unsmob_stream_event (sev); - - return e->internal_get_property (sym); + LY_ASSERT_TYPE (unsmob_stream_event, sev, 1) + return ly_prob_property (sev, sym, val); } LY_DEFINE (ly_event_set_property_x, "ly:event-set-property!", -- 2.39.5