diogo/yap-6.3
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of yap.dcc.fc.up.pt:yap-6

Browse Source 
Conflicts:
	library/dialect/swi.yap
This commit is contained in:
Vitor Santos Costa 2010-11-28 13:48:09 +00:00
commit fe1fbaf6f7
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
library/tries/core_dbtries.c
View File

@ -612,8 +612,17 @@ TrNode core_breadth_reduction(TrEngine engine, TrNode node, TrNode breadth_node,
} while (bucket != first_bucket); } while (bucket != first_bucket);
} else { } else {
do { do {
if (TrNode_entry(child) == PairEndTag) if (TrNode_entry(child) == PairEndTag) {
return core_breadth_reduction(engine, child, breadth_node, opt_level, construct_function, destruct_function, copy_function, correct_order_function); /* do breadth reduction simplification */
node = TrNode_parent(child);
DATA_DESTRUCT_FUNCTION = destruct_function;
remove_child_nodes(TrNode_child(node));
TrNode_child(node) = NULL;
node = trie_node_check_insert(node, PairEndTag);
INCREMENT_ENTRIES(CURRENT_TRIE_ENGINE);
return node;
//return core_breadth_reduction(engine, node, breadth_node, opt_level, construct_function, destruct_function, copy_function, correct_order_function);
}
while (IS_FUNCTOR_NODE(child)) { while (IS_FUNCTOR_NODE(child)) {
child = TrNode_child(child); child = TrNode_child(child);
if (IS_HASH_NODE(child)) { // gets first child in the hash if (IS_HASH_NODE(child)) { // gets first child in the hash