Merge with master

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

diff --git a/lily/stream-event.cc b/lily/stream-event.cc
index eb530046a0fa5fd8548484be070861f486ca9c6c..12219884b1071d40e9919e4cf13b771b515d2148 100644 (file)
--- a/lily/stream-event.cc
+++ b/lily/stream-event.cc
@@ -11,48 +11,34 @@
 #include "ly-smobs.icc"
 #include "context.hh"
 #include "input.hh"
-#include "input-smob.hh"
-
-Stream_event::~Stream_event ()
-{
-}
-
-void
-Stream_event::init ()
-{
-  self_scm_ = SCM_EOL;
-  property_alist_ = SCM_EOL;
+#include "input.hh"
 
-  smobify_self ();
-}
+/* TODO: Rename Stream_event -> Event */
 
 Stream_event::Stream_event ()
+  : Prob (ly_symbol2scm ("Stream_event"), SCM_EOL)
 {
-  init ();
 }
 
-Stream_event::Stream_event (SCM property_alist)
+Stream_event::Stream_event (SCM event_class, SCM mutable_props)
+  : Prob (ly_symbol2scm ("Stream_event"),
+         scm_list_1 (scm_cons (ly_symbol2scm ("class"), event_class)))
 {
-  init ();
-  property_alist_ = property_alist;
+  mutable_property_alist_ = mutable_props;
 }
 
-/*
-   Hm. Perhaps Stream_event should be a prob, with class_name as an
-   immutable property?
- */
 Stream_event::Stream_event (SCM class_name, Input *origin)
+  : Prob (ly_symbol2scm ("Stream_event"),
+         scm_list_1 (scm_cons (ly_symbol2scm ("class"), class_name)))
 {
-  init ();
-  set_property ("class", class_name);
   if (origin)
     set_spot (origin);
 }
 
-Stream_event::Stream_event (Stream_event *ev)
+SCM
+Stream_event::copy_mutable_properties () const
 {
-  init ();
-  property_alist_ = scm_copy_tree (ev->property_alist_);
+  return ly_event_deep_copy (mutable_property_alist_);
 }
 
 Input *
@@ -62,29 +48,20 @@ Stream_event::origin () const
   return i ? i : &dummy_input_global;
 }
 
-void Stream_event::set_spot (Input *i)
+void
+Stream_event::set_spot (Input *i)
 {
   set_property ("origin", make_input (*i));
 }
 
-SCM
-Stream_event::mark_smob (SCM sm)
-{
-  Stream_event *me = (Stream_event *) SCM_CELL_WORD_1 (sm);
-  return me->property_alist_;
-}
-
-int
-Stream_event::print_smob (SCM s, SCM port, scm_print_state *)
+bool
+Stream_event::internal_in_event_class (SCM class_name)
 {
-  scm_puts ("#<Stream_event ", port);
-  scm_write (dump (s), port);
-  scm_puts (" >", port);
-  return 1;
+  SCM cl = get_property ("class");
+  cl = scm_call_1 (ly_lily_module_constant ("ly:make-event-class"), cl);
+  return scm_c_memq (class_name, cl) != SCM_BOOL_F;
 }
 
-IMPLEMENT_SMOBS (Stream_event);
-IMPLEMENT_DEFAULT_EQUAL_P (Stream_event);
 IMPLEMENT_TYPE_P (Stream_event, "ly:stream-event?");
 
 MAKE_SCHEME_CALLBACK (Stream_event, undump, 1);
@@ -95,28 +72,21 @@ Stream_event::dump (SCM self)
 {
   Stream_event *ev = unsmob_stream_event (self);
   // Reversed alists look prettier.
-  return scm_reverse (ev->property_alist_);
+  return scm_cons (scm_reverse (ev->immutable_property_alist_),
+                  scm_reverse (ev->mutable_property_alist_));
 }
 
 SCM
 Stream_event::undump (SCM data)
 {
   Stream_event *obj = new Stream_event ();
-  obj->property_alist_ = scm_reverse (data);
+  obj->immutable_property_alist_ = scm_reverse (scm_car (data));
+  obj->mutable_property_alist_ = scm_reverse (scm_cdr (data));
   return obj->unprotect ();
 }
 
-SCM
-Stream_event::internal_get_property (SCM sym) const
-{
-  SCM s = scm_sloppy_assq (sym, property_alist_);
-  if (s != SCM_BOOL_F)
-    return scm_cdr (s);
-  return SCM_EOL;
-}
-
-void 
-Stream_event::internal_set_property (SCM prop, SCM val)
+Stream_event *
+unsmob_stream_event (SCM m)
 {
-  property_alist_ = scm_assq_set_x (property_alist_, prop, val);
+  return dynamic_cast<Stream_event*> (unsmob_prob (m));
 }