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

diff --git a/lily/stream-event-scheme.cc b/lily/stream-event-scheme.cc
index 1f890782a4..04df26a722 100644
--- a/lily/stream-event-scheme.cc
+++ b/lily/stream-event-scheme.cc
@@ -3,7 +3,7 @@
 
   source file of the GNU LilyPond music typesetter
 
-  (c) 2006 Erik Sandberg  <mandolaerik@gmail.com>
+  (c) 2006--2007 Erik Sandberg  <mandolaerik@gmail.com>
 */
 
 #include "stream-event.hh"
@@ -12,13 +12,14 @@ 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");
-  if (proplist != SCM_UNDEFINED)
-    {
-      SCM_ASSERT_TYPE (scm_list_p (proplist), proplist, SCM_ARG2, __FUNCTION__, "association list");
-    }
-  else
+  LY_ASSERT_TYPE (ly_is_symbol, cl, 1);
+
+  /* should be scm_list_p, but scm_list_p is expensive. */
+  LY_ASSERT_TYPE (scm_is_pair, proplist, 2);
+  
+  if (proplist == SCM_UNDEFINED)
     proplist = SCM_EOL;
+
   Stream_event *e = new Stream_event (cl, proplist);
   return e->unprotect ();
 }
@@ -28,17 +29,37 @@ 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);
 }
+
+LY_DEFINE (ly_event_deep_copy, "ly:event-deep-copy",
+	   1, 0, 0, (SCM m),
+	   "Copy @var{m} and all sub expressions of @var{m}")
+{
+  SCM copy = m;
+  if (Stream_event *ev = unsmob_stream_event (m))
+    {
+      ev = ev->clone ();
+      copy = ev->unprotect ();
+    }
+  else if (scm_is_pair (m))
+    copy = scm_cons (ly_event_deep_copy (scm_car (m)),
+		     ly_event_deep_copy (scm_cdr (m)));
+
+  return copy;
+}