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

BUGFIX: C-minimality was tripping over claims.

Browse Source
This commit is contained in:
Cas Cremers 2008-11-09 15:11:43 +01:00
parent f21c02e772
commit d633a62f0d
1 changed files with 46 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/binding.c
View File

@ -543,26 +543,32 @@ bindings_c_minimal ()
for (run = 0; run < sys->maxruns; run++) for (run = 0; run < sys->maxruns; run++)
{ {
int ev; int ev;
Roledef rd;
rd = sys->runs[run].start;
//!@todo hardcoded reference to step, should be length //!@todo hardcoded reference to step, should be length
for (ev = 0; ev < sys->runs[run].step; ev++) for (ev = 0; ev < sys->runs[run].step; ev++)
{
if (rd->type == SEND || rd->type == READ)
{ {
if (isDependEvent (run, ev, b->run_from, b->ev_from)) if (isDependEvent (run, ev, b->run_from, b->ev_from))
{ {
// this node is *before* the from node // this node is *before* the from node
Roledef rd;
int occursthere; int occursthere;
rd = roledef_shift (sys->runs[run].start, ev);
if (switches.intruder) if (switches.intruder)
{ {
// intruder: interm bindings should cater for the first occurrence // intruder: interm bindings should cater for the first occurrence
occursthere = termInTerm (rd->message, b->term); occursthere =
termInTerm (rd->message, b->term);
} }
else else
{ {
// no intruder, then simple test // no intruder, then simple test
occursthere = isTermEqual (rd->message, b->term); occursthere =
isTermEqual (rd->message, b->term);
} }
if (occursthere) if (occursthere)
{ {
@ -594,6 +600,8 @@ bindings_c_minimal ()
} }
} }
} }
rd = rd->next;
}
} }
bl = bl->next; bl = bl->next;
} }