CHG: Changed default behaviour to Arachne engine.

NEW: Added 'S' switch for --summary things.
This commit is contained in:
ccremers 2005-11-04 13:23:30 +00:00
parent 5e1ca56f87
commit c1c0b856de

View File

@ -36,7 +36,7 @@ switchesInit (int argc, char **argv)
switches.argv = argv; switches.argv = argv;
// Methods // Methods
switches.engine = POR_ENGINE; // default is partial ordering engine switches.engine = ARACHNE_ENGINE; // default is arachne engine
switches.match = 0; // default matching switches.match = 0; // default matching
switches.clp = 0; switches.clp = 0;
switches.tupling = 0; switches.tupling = 0;
@ -275,7 +275,9 @@ switcher (const int process, int index)
{ {
if (!process) if (!process)
{ {
helptext ("-a,--arachne", "select Arachne engine [modelchecker]"); /*
* Obsolete switch, as it is now the default behaviour.
*/
} }
else else
{ {
@ -285,6 +287,20 @@ switcher (const int process, int index)
} }
} }
if (detect ('M', "modelchecker", 0))
{
if (!process)
{
helptext ("-M,--modelchecker", "select Model checking engine [Arachne]");
}
else
{
// Select arachne engine
switches.engine = POR_ENGINE;
return index;
}
}
if (detect ('x', "xml-output", 0)) if (detect ('x', "xml-output", 0))
{ {
if (!process) if (!process)
@ -302,7 +318,7 @@ switcher (const int process, int index)
{ {
if (!process) if (!process)
{ {
helptext ("-m,--match=<int>", "matching method [0]"); helptext ("-m,--match=<int>", "matching method [0] (0:Typed,1:Basic,2:Typeless)");
} }
else else
{ {
@ -617,11 +633,11 @@ switcher (const int process, int index)
} }
} }
if (detect (' ', "summary", 0)) if (detect ('S', "summary", 0))
{ {
if (!process) if (!process)
{ {
helptext ("--summary", "show summary only: omit attack details"); helptext ("-S,--summary", "show summary only: omit attack details");
} }
else else
{ {