Context::Context (Context const &src)
{
+ (void) src;
assert (false);
}
}
-Context::Context (Object_key const *key)
+Context::Context ()
{
daddy_context_ = 0;
aliases_ = SCM_EOL;
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 ());
}
Context_def *cdef = path[0];
- Context *new_context = cdef->instantiate (ops, key);
+ Context *new_context = cdef->instantiate (ops);
new_context->id_string_ = id;
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?")));
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)));