|
|
@@ -73,7 +73,7 @@ Element function expand_current_state(model : Element, state : String, data : El
|
|
|
hierarchy = find_hierarchy(model, deep_state, data)
|
|
|
// Got the hierarchy of one of the states
|
|
|
|
|
|
- if (set_in(hierarchy, state)):
|
|
|
+ if (list_in(hierarchy, state)):
|
|
|
// This hierarchy contains the root state we are checking for, so add to set
|
|
|
set_add(result, deep_state)
|
|
|
|
|
|
@@ -464,11 +464,11 @@ Void function execute_actions(model : Element, source_states : Element, target_s
|
|
|
|
|
|
hierarchy_sources = set_create()
|
|
|
while (set_len(source_states) > 0):
|
|
|
- set_add(hierarchy_sources, find_hierarchy(model, set_pop(source_states), data))
|
|
|
+ set_add_node(hierarchy_sources, find_hierarchy(model, set_pop(source_states), data))
|
|
|
|
|
|
hierarchy_targets = set_create()
|
|
|
while (set_len(target_states) > 0):
|
|
|
- set_add(hierarchy_targets, find_hierarchy(model, set_pop(target_states), data))
|
|
|
+ set_add_node(hierarchy_targets, find_hierarchy(model, set_pop(target_states), data))
|
|
|
|
|
|
all_hierarchies = set_copy(hierarchy_sources)
|
|
|
set_merge(all_hierarchies, hierarchy_targets)
|
