Removed another simple trampoline.

This commit is contained in:
Cas Cremers 2018-10-21 18:52:20 +02:00
parent d9e17005ae
commit 1c81b04aa2

View File

@ -49,10 +49,8 @@ extern int max_encryption_level;
int int
correctLocalOrder (const System sys) correctLocalOrder (const System sys)
{ {
int flag; int r1;
int checkRun (int r1)
{
int checkTerm (Term t) int checkTerm (Term t)
{ {
if (!isTermVariable (t)) if (!isTermVariable (t))
@ -83,7 +81,6 @@ correctLocalOrder (const System sys)
(" cannot be correct: the first send r%ii%i occurs after the receive r%ii%i.\n", (" cannot be correct: the first send r%ii%i occurs after the receive r%ii%i.\n",
r2, e2, r1, e1); r2, e2, r1, e1);
} }
flag = false;
return false; return false;
} }
} }
@ -104,13 +101,17 @@ correctLocalOrder (const System sys)
return true; return true;
} }
return iterateLocalToOther (sys, r1, checkTerm); for (r1 = 0; r1 < sys->maxruns; r1++)
{
if (sys->runs[r1].protocol != INTRUDER)
{
if (!iterateLocalToOther (sys, r1, checkTerm))
{
return false;
} }
}
flag = true; }
iterateRegularRuns (sys, checkRun); return true;
return flag;
} }
//! Check all runs //! Check all runs