* VERSION (MY_PATCH_LEVEL): make 1.7.0

[lilypond.git] / lily / music.cc

diff --git a/lily/music.cc b/lily/music.cc
index e10507230498b89c27001ab17717b2033e4bcf1a..40d913266a9ae8551d1cccec448801a6d663866e 100644 (file)
--- a/lily/music.cc
+++ b/lily/music.cc
@@ -34,6 +34,7 @@ ly_deep_mus_copy (SCM m)
 
 Music::Music ()
 {
+  self_scm_ = SCM_EOL; 
   immutable_property_alist_ = SCM_EOL;
   mutable_property_alist_ = SCM_EOL;
   smobify_self ();
@@ -43,6 +44,7 @@ Music::Music (Music const &m)
 {
   immutable_property_alist_ = m.immutable_property_alist_;
   mutable_property_alist_ = SCM_EOL;
+  self_scm_ = SCM_EOL;
 
   /*
     First we smobify_self, then we copy over the stuff.  If we don't,
@@ -57,6 +59,7 @@ Music::Music (Music const &m)
 
 Music::Music (SCM l)
 {
+  self_scm_ = SCM_EOL;
   immutable_property_alist_ = l;
   mutable_property_alist_ = SCM_EOL;
   smobify_self ();
@@ -184,10 +187,9 @@ Music::internal_get_mus_property (SCM sym) const
 void
 Music::internal_set_mus_property (SCM s, SCM v)
 {
-#ifndef NDEBUG
   if (internal_type_checking_global_b)
-    assert (type_check_assignment (s, v, ly_symbol2scm ("music-type?")));
-#endif
+    if (!type_check_assignment (s, v, ly_symbol2scm ("music-type?")))
+      abort ();
 
   mutable_property_alist_ =  scm_assq_set_x (mutable_property_alist_, s, v);
 }
@@ -232,7 +234,7 @@ LY_DEFINE(ly_set_mus_property,
          "Set property @var{sym} in music expression @var{mus} to @var{val}.")
 {
   Music * sc = unsmob_music (mus);
-  SCM_ASSERT_TYPE(sc, mus, SCM_ARG1, __FUNCTION__, "grob");
+  SCM_ASSERT_TYPE(sc, mus, SCM_ARG1, __FUNCTION__, "music");
   SCM_ASSERT_TYPE(gh_symbol_p (sym), sym, SCM_ARG2, __FUNCTION__, "symbol");  
 
   bool ok = type_check_assignment (sym, val, ly_symbol2scm ("music-type?"));
@@ -274,7 +276,7 @@ LY_DEFINE(ly_music_name, "ly-music-name", 1, 0, 0,
   SCM_ASSERT_TYPE(m, mus, SCM_ARG1, __FUNCTION__ ,"music");
   
   const char * nm = classname (m);
-  return ly_str02scm (nm);
+  return scm_makfrom0str (nm);
 }
 
 LY_DEFINE(ly_music_list_p,"music-list?", 1, 0, 0,