- Fixed the broken '--no-intruder' switch.

This commit is contained in:
ccremers 2005-12-29 12:14:21 +00:00
parent c79c9eb73f
commit a50245734d

View File

@ -2853,12 +2853,27 @@ prune_bounds ()
if (enoughAttacks (sys)) if (enoughAttacks (sys))
return 1; return 1;
// Limit on intruder events count // Pruning involving the number of intruder actions
if (switches.maxIntruderActions < INT_MAX || !(switches.intruder))
{ {
// Only check if actually used // Count intruder actions
if (!(switches.intruder) int actioncount;
|| countIntruderActions () > switches.maxIntruderActions)
actioncount = countIntruderActions ();
// Limit intruder actions in any case
if (!(switches.intruder) && actioncount > 0)
{
if (switches.output == PROOF)
{
indentPrint ();
eprintf
("Pruned: no intruder allowed.\n", switches.maxIntruderActions);
}
return 1;
}
// Limit on intruder events count
if (actioncount > switches.maxIntruderActions)
{ {
if (switches.output == PROOF) if (switches.output == PROOF)
{ {