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

Another trampoline gone.

Browse Source
This commit is contained in:
Cas Cremers 2018-10-19 16:17:06 -04:00
parent 24c6e47f07
commit 45b2d97883
1 changed files with 46 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/compiler.c
View File

@ -1724,14 +1724,24 @@ order_label_roles (const Claimlist cl)
distance = 0; distance = 0;
while (roles_remaining != NULL) while (roles_remaining != NULL)
{ {
int scan_label (void *data) List ll;
distance++;
#ifdef DEBUG
if (DEBUGL (4))
{
eprintf (" %i:", distance);
}
#endif
for (ll = sys->labellist; ll != NULL; ll = ll->next)
{ {
Labelinfo linfo; Labelinfo linfo;
linfo = (Labelinfo) ll->data;
if (linfo != NULL)
{
Termlist tl; Termlist tl;
linfo = (Labelinfo) data;
if (linfo == NULL)
return 1;
tl = cl->prec; tl = cl->prec;
if (inTermlist (tl, linfo->label)) if (inTermlist (tl, linfo->label))
{ {
@ -1740,7 +1750,8 @@ order_label_roles (const Claimlist cl)
// If it's not the same protocol, the labels can't match // If it's not the same protocol, the labels can't match
// This function checks whether the newrole can connect to the connectedrole, and whether they fulfil their requirements. // This function checks whether the newrole can connect to the connectedrole, and whether they fulfil their requirements.
void roles_test (const Term connectedrole, const Term newrole) void roles_test (const Term connectedrole,
const Term newrole)
{ {
if (inTermlist (roles_ordered, connectedrole) && if (inTermlist (roles_ordered, connectedrole) &&
inTermlist (roles_remaining, newrole)) inTermlist (roles_remaining, newrole))
@ -1752,7 +1763,8 @@ order_label_roles (const Claimlist cl)
termPrint (newrole); termPrint (newrole);
} }
#endif #endif
roles_ordered = termlistAppend (roles_ordered, newrole); roles_ordered =
termlistAppend (roles_ordered, newrole);
roles_remaining = roles_remaining =
termlistDelTerm (termlistFind termlistDelTerm (termlistFind
(roles_remaining, newrole)); (roles_remaining, newrole));
@ -1763,17 +1775,9 @@ order_label_roles (const Claimlist cl)
roles_test (linfo->recvrole, linfo->sendrole); roles_test (linfo->recvrole, linfo->sendrole);
} }
} }
return 1; }
} }
distance++;
#ifdef DEBUG
if (DEBUGL (4))
{
eprintf (" %i:", distance);
}
#endif
list_iterate (sys->labellist, scan_label);
} }
cl->roles = roles_ordered; cl->roles = roles_ordered;
#ifdef DEBUG #ifdef DEBUG