commit some long outstanding changes
This commit is contained in:
parent
e046f2f972
commit
558772fbe4
2 changed files with 7 additions and 3 deletions
|
|
@ -78,8 +78,7 @@ def bootstrap_scd(state: State) -> UUID:
|
||||||
add_edge_element("gc_inh_element", glob_constr_node, element_node)
|
add_edge_element("gc_inh_element", glob_constr_node, element_node)
|
||||||
# # Attribute inherits from Element
|
# # Attribute inherits from Element
|
||||||
add_edge_element("attr_inh_element", attr_node, element_node)
|
add_edge_element("attr_inh_element", attr_node, element_node)
|
||||||
# # Association inherits from Element
|
# # Association inherits from Class
|
||||||
# add_edge_element("assoc_inh_element", assoc_edge, element_node)
|
|
||||||
add_edge_element("assoc_inh_element", assoc_edge, class_node)
|
add_edge_element("assoc_inh_element", assoc_edge, class_node)
|
||||||
# # AttributeLink inherits from Element
|
# # AttributeLink inherits from Element
|
||||||
add_edge_element("attr_link_inh_element", attr_link_edge, element_node)
|
add_edge_element("attr_link_inh_element", attr_link_edge, element_node)
|
||||||
|
|
|
||||||
|
|
@ -223,7 +223,12 @@ def rewrite(state,
|
||||||
result = exec_then_eval(python_expr,
|
result = exec_then_eval(python_expr,
|
||||||
_globals=eval_globals,
|
_globals=eval_globals,
|
||||||
_locals={'this': host_obj}) # 'this' can be used to read the previous value of the slot
|
_locals={'this': host_obj}) # 'this' can be used to read the previous value of the slot
|
||||||
host_odapi.overwrite_primitive_value(host_obj_name, result, is_code=False)
|
# print("EVAL", common_name, python_expr, "RESULT", result, host_obj_name)
|
||||||
|
try:
|
||||||
|
host_odapi.overwrite_primitive_value(host_obj_name, result, is_code=False)
|
||||||
|
except Exception as e:
|
||||||
|
e.add_note(f"while evaluating attribute {common_name}")
|
||||||
|
raise
|
||||||
else:
|
else:
|
||||||
msg = f"Don't know what to do with element '{common_name}' -> '{host_obj_name}:{host_type}')"
|
msg = f"Don't know what to do with element '{common_name}' -> '{host_obj_name}:{host_type}')"
|
||||||
# print(msg)
|
# print(msg)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue