andr3/scyther
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed term_iterate_leaves.

Browse Source
This commit is contained in:
Cas Cremers 2018-10-31 23:48:45 +01:00
parent fe1be9b3f0
commit 92c5b0bedc
3 changed files with 13 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/TODO-trampolines.txt
View File

@ -3,7 +3,6 @@
1 term_iterate_open_leaves dotout.c +1790 // Could be replaced by term_iterate_leaves 1 term_iterate_open_leaves dotout.c +1790 // Could be replaced by term_iterate_leaves
3 unify mgu.c +233 ; mgu.c +247 ; mgu.c +281 3 unify mgu.c +233 ; mgu.c +247 ; mgu.c +281
1 iterateLocalToOther prune_theorems.c +108 1 iterateLocalToOther prune_theorems.c +108
1 term_iterate_leaves term.c +1145
term_iterate_leaves term_iterate_leaves
term_iterate_state_leaves term_iterate_state_leaves
@ -15,5 +14,4 @@ subtermUnify is called using unifiesWithKeys
term_iterate_open_leaves is called using addsubterms term_iterate_open_leaves is called using addsubterms
unify is called using unify_combine_enc and unify_combined_tup, and a callback using the keys list? (which propagates back to subtermunify data) unify is called using unify_combine_enc and unify_combined_tup, and a callback using the keys list? (which propagates back to subtermunify data)
iterateLocalToOther is called using checkTerm iterateLocalToOther is called using checkTerm
term_iterate_leaves is called using testleaf

39
src/term.c
View File

@ -1148,47 +1148,34 @@ term_iterate_state_leaves (const Term term, int (*func) (), void (*state))
* well. It is up to func to decide wether or not to recurse. * well. It is up to func to decide wether or not to recurse.
*/ */
int int
term_iterate_leaves (const Term term, int (*func) (Term t)) term_iterate_open_leaves (const Term term, int (*func) (Term t))
{ {
if (term != NULL) if (term != NULL)
{ {
if (realTermLeaf (term)) if (realTermLeaf (term))
{ {
if (!func (term)) if (substVar (term))
return 0; {
return term_iterate_open_leaves (term->subst, func);
}
else
{
return func (term);
}
} }
else else
{ {
if (realTermTuple (term)) if (realTermTuple (term))
return (term_iterate_leaves (TermOp1 (term), func) return (term_iterate_open_leaves (TermOp1 (term), func)
&& term_iterate_leaves (TermOp2 (term), func)); && term_iterate_open_leaves (TermOp2 (term), func));
else else
return (term_iterate_leaves (TermOp (term), func) return (term_iterate_open_leaves (TermOp (term), func)
&& term_iterate_leaves (TermKey (term), func)); && term_iterate_open_leaves (TermKey (term), func));
} }
} }
return 1; return 1;
} }
//! Iterate over open leaves (i.e. respect variable closure)
int
term_iterate_open_leaves (const Term term, int (*func) (Term t))
{
int testleaf (const Term t)
{
if (substVar (t))
{
return term_iterate_open_leaves (t->subst, func);
}
else
{
return func (t);
}
}
return term_iterate_leaves (term, testleaf);
}
//! Turn all rolelocals into variables //! Turn all rolelocals into variables
void void
term_rolelocals_are_variables () term_rolelocals_are_variables ()

1
src/term.h
View File

@ -198,7 +198,6 @@ int term_iterate_state_deVar (Term term, int (*leaf) (),
int (*nodel) (), int (*nodel) (),
int (*nodem) (), int (*nodem) (),
int (*noder) (), void (*state)); int (*noder) (), void (*state));
int term_iterate_leaves (const Term t, int (*func) (Term t));
int term_iterate_state_leaves (const Term term, int term_iterate_state_leaves (const Term term,
int (*func) (), void (*state)); int (*func) (), void (*state));
int term_iterate_open_leaves (const Term term, int (*func) (Term t)); int term_iterate_open_leaves (const Term term, int (*func) (Term t));