if (val != SCM_EOL)
ok = type_check_assignment (sym, val, ly_symbol2scm ("translation-type?"));
if (ok)
- internal_set_property (sym, val);
+ set_property (sym, val);
}
}
Stream_event *e = new Stream_event (type, origin);
for (int i = 0; props[i]; i += 2)
{
- e->internal_set_property (props[i], props[i+1]);
+ e->set_property (props[i], props[i+1]);
}
event_source_->broadcast (e);
e->unprotect ();
}
void
-Context::internal_set_property (SCM sym, SCM val)
+Context::internal_set_property (SCM sym, SCM val
+#ifndef NDEBUG
+ , char const *file, int line, char const *fun
+#endif
+ )
{
#ifndef NDEBUG
+ (void) file;
+ (void) line;
+ (void) fun;
+#endif
+
if (do_internal_type_checking_global)
assert (type_check_assignment (sym, val, ly_symbol2scm ("translation-type?")));
-#endif
properties_dict ()->set (sym, val);
}
Context::remove_context (SCM)
{
/* ugh, the translator group should listen to RemoveContext events by itself */
- implementation ()->disconnect_from_context ();
+ Translator_group *impl = implementation ();
+ if (impl)
+ impl->disconnect_from_context ();
disconnect_from_parent ();
}
scm_gc_mark (me->definition_mods_);
scm_gc_mark (me->properties_scm_);
scm_gc_mark (me->accepts_list_);
+
if (me->implementation_)
scm_gc_mark (me->implementation_->self_scm ());
- if (me->event_source_) scm_gc_mark (me->event_source_->self_scm ());
- if (me->events_below_) scm_gc_mark (me->events_below_->self_scm ());
+
+ if (me->event_source_)
+ scm_gc_mark (me->event_source_->self_scm ());
+
+ if (me->events_below_)
+ scm_gc_mark (me->events_below_->self_scm ());
return me->properties_scm_;
}
void
set_context_property_on_children (Context *trans, SCM sym, SCM val)
{
- trans->internal_set_property (sym, ly_deep_copy (val));
+ trans->set_property (sym, ly_deep_copy (val));
for (SCM p = trans->children_contexts (); scm_is_pair (p); p = scm_cdr (p))
{
Context *trg = unsmob_context (scm_car (p));