X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fcontext.cc;h=3c982751fd6635e1822ad525a54471a2fb893a07;hb=2ccc67220825a871f318c1de91bec5aa6d89d09d;hp=53bca3b07bb8ebbf6a148cd0ec2f7898cb9b856e;hpb=801b2c64360b181dabe76d02bb001b88e2643bb6;p=lilypond.git

diff --git a/lily/context.cc b/lily/context.cc
index 53bca3b07b..3c982751fd 100644
--- a/lily/context.cc
+++ b/lily/context.cc
@@ -48,6 +48,7 @@ Context::check_removal ()
 
 Context::Context (Context const &src)
 {
+  (void) src;
   assert (false);
 }
 
@@ -68,7 +69,7 @@ Context::add_context (Context *child)
 }
 
 
-Context::Context (Object_key const *key)
+Context::Context ()
 {
   daddy_context_ = 0;
   aliases_ = SCM_EOL;
@@ -259,7 +260,6 @@ Context::create_context_from_event (SCM sev)
   SCM ops = ev->get_property ("ops");
   SCM type_scm = ev->get_property ("type");
   string type = ly_symbol2string (type_scm);
-  Object_key const *key = 0;
   
   vector<Context_def*> path
     = unsmob_context_def (definition_)->path_to_acceptable_context (type_scm, get_output_def ());
@@ -270,7 +270,7 @@ Context::create_context_from_event (SCM sev)
     }
   Context_def *cdef = path[0];
   
-  Context *new_context = cdef->instantiate (ops, key);
+  Context *new_context = cdef->instantiate (ops);
 
   new_context->id_string_ = id;
   
@@ -460,19 +460,16 @@ Context::add_alias (SCM sym)
   aliases_ = scm_cons (sym, aliases_);
 }
 
+/* we don't (yet) instrument context properties */
 void
-Context::internal_set_property (SCM sym, SCM val
-#ifndef NDEBUG
-				, char const *file, int line, char const *fun
-#endif
-				)
+Context::instrumented_set_property (SCM sym, SCM val, const char*, int, const char*)
 {
-#ifndef NDEBUG
-  (void) file;
-  (void) line;
-  (void) fun;
-#endif
+  internal_set_property (sym, val);
+}
 
+void
+Context::internal_set_property (SCM sym, SCM val)
+{
   if (do_internal_type_checking_global)
     assert (type_check_assignment (sym, val, ly_symbol2scm ("translation-type?")));
 
@@ -720,7 +717,7 @@ melisma_busy (Context *tr)
   SCM melisma_properties = tr->get_property ("melismaBusyProperties");
   bool busy = false;
 
-  for (; scm_is_pair (melisma_properties);
+  for (; !busy && scm_is_pair (melisma_properties);
        melisma_properties = scm_cdr (melisma_properties))
     busy = busy || to_boolean (tr->internal_get_property (scm_car (melisma_properties)));