- Improved output significantly.

This commit is contained in:
ccremers
2005-12-27 12:24:12 +00:00
parent 5ff71fa661
commit 397298290b
2 changed files with 58 additions and 50 deletions

View File

@@ -274,7 +274,7 @@ switcher (const int process, int index)
/* ==================
* Generic options
*/
if (detect ('a', "arachne", 0))
if (detect ('A', "arachne", 0))
{
if (!process)
{
@@ -337,11 +337,11 @@ switcher (const int process, int index)
}
}
if (detect ('P', "proof", 0))
if (detect ('p', "proof", 0))
{
if (!process)
{
helptext ("-P,--proof", "show explicit proof");
helptext ("-p,--proof", "show explicit proof");
}
else
{
@@ -351,6 +351,33 @@ switcher (const int process, int index)
}
}
if (detect ('c', "class", 0))
{
if (!process)
{
helptext ("-c,--class",
"generate full class (show uninstantiated variables)");
}
else
{
switches.concrete = false;
return index;
}
}
if (detect (' ', "concrete", 0))
{
if (!process)
{
/* this is now the default */
}
else
{
switches.concrete = true;
return index;
}
}
/* ==================
* Bounding options
*/
@@ -426,11 +453,11 @@ switcher (const int process, int index)
}
}
if (detect ('A', "all-attacks", 0))
if (detect ('a', "all-attacks", 0))
{
if (!process)
{
helptext ("-A,--all-attacks",
helptext ("-a,--all-attacks",
"generate all attacks instead of just one");
}
else
@@ -455,12 +482,12 @@ switcher (const int process, int index)
}
}
if (detect ('p', "prune", 1))
if (detect ('P', "prune", 1))
{
if (!process)
{
/* not very important
helptext ("-p,--prune=<int>", "pruning method when an attack is found [2]");
helptext ("-P,--prune=<int>", "pruning method when an attack is found [2]");
*/
}
else
@@ -692,33 +719,6 @@ switcher (const int process, int index)
}
}
if (detect ('C', "class", 0))
{
if (!process)
{
helptext ("-C,--class",
"generate full class (show uninstantiated variables)");
}
else
{
switches.concrete = false;
return index;
}
}
if (detect (' ', "concrete", 0))
{
if (!process)
{
/* this is now the default */
}
else
{
switches.concrete = true;
return index;
}
}
#ifdef DEBUG
/* ==================
* Experimental options