- Improved Reachable claims output

- Use square brackets for remark output instead of normal brackets.
This commit is contained in:
ccremers 2005-12-28 14:42:46 +00:00
parent bceaca28f0
commit e19f8bddd1

View File

@ -456,9 +456,20 @@ timersPrint (const System sys)
if (cl_scan->count > 0 && cl_scan->failed > 0) if (cl_scan->count > 0 && cl_scan->failed > 0)
{ {
/* there is an attack */ /* there is an attack */
eprintf ("yes\t"); if (!isTermEqual (cl_scan->type, CLAIM_Reachable))
{
/* a normal claim */
eprintf ("yes");
}
else
{
/* Reachable is not an attack */
eprintf ("no");
}
eprintf ("\t");
/* are these all attacks? */ /* are these all attacks? */
eprintf ("("); eprintf ("[");
if (cl_scan->complete) if (cl_scan->complete)
{ {
eprintf ("exactly"); eprintf ("exactly");
@ -467,7 +478,12 @@ timersPrint (const System sys)
{ {
eprintf ("at least"); eprintf ("at least");
} }
eprintf (" %i)", cl_scan->failed); eprintf (" %i variant", cl_scan->failed);
if (cl_scan->failed != 1)
{
eprintf ("s");
}
eprintf ("]");
} }
else else
{ {
@ -478,7 +494,7 @@ timersPrint (const System sys)
if (cl_scan->count == 0) if (cl_scan->count == 0)
{ {
/* not encountered */ /* not encountered */
eprintf ("(does not occur)"); eprintf ("[does not occur]");
} }
else else
{ {
@ -486,12 +502,12 @@ timersPrint (const System sys)
if (cl_scan->complete) if (cl_scan->complete)
{ {
/* complete proof */ /* complete proof */
eprintf ("(proof of correctness)"); eprintf ("[proof of correctness]");
} }
else else
{ {
/* only due to bounds */ /* only due to bounds */
eprintf ("(no attack within bounds)"); eprintf ("[no attack within bounds]");
if (cl_scan->timebound) if (cl_scan->timebound)
eprintf ("\ttime=%i", get_time_limit ()); eprintf ("\ttime=%i", get_time_limit ());
} }
@ -501,7 +517,7 @@ timersPrint (const System sys)
/* any warnings */ /* any warnings */
if (cl_scan->warnings) if (cl_scan->warnings)
{ {
eprintf ("\t(read the warnings for more information)"); eprintf ("\t[read the warnings for more information]");
} }
/* proceed to next claim */ /* proceed to next claim */