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

Removing one trampoline: switching unify_combined_enc to non-local function.

Browse Source
This commit is contained in:
Cas Cremers 2018-12-24 13:37:58 +01:00
parent 61a1b862ea
commit 102a3ff3b7
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/mgu.c
View File

@ -121,6 +121,14 @@ termlistSubstReset (Termlist tl)
} }
} }
struct state_mgu_tmp
{
void *oldstate;
int (*oldcallback) ();
Term unifyt1;
Term unifyt2;
};
//! Most general unifier iteration //! Most general unifier iteration
/** /**
* Try to determine the most general unifier of two terms, if so calls function. * Try to determine the most general unifier of two terms, if so calls function.
@ -232,15 +240,23 @@ unify (Term t1, Term t2, Termlist tl, int (*callback) (), void *state)
/* encryption first */ /* encryption first */
if (realTermEncrypt (t1)) if (realTermEncrypt (t1))
{ {
int unify_combined_enc (Termlist tl, void *state) struct state_mgu_tmp tmpstate;
tmpstate.oldstate = state;
tmpstate.oldcallback = callback;
tmpstate.unifyt1 = TermOp (t1);
tmpstate.unifyt2 = TermOp (t2);
int unify_combined_enc (Termlist tl, struct state_mgu_tmp *ptr_tmpstate)
{ {
// now the keys are unified (subst in this tl) // now the keys are unified (subst in this tl)
// and we try the inner terms // and we try the inner terms
return unify (TermOp (t1), TermOp (t2), tl, callback, state); return unify (ptr_tmpstate->unifyt1, ptr_tmpstate->unifyt2, tl,
ptr_tmpstate->oldcallback, ptr_tmpstate->oldstate);
} }
return unify (TermKey (t1), TermKey (t2), tl, unify_combined_enc, return unify (TermKey (t1), TermKey (t2), tl, unify_combined_enc,
state); &tmpstate);
} }
/* tupling second /* tupling second