From d2ac5182344229fcb621dd14d1b1d691709bb9fc Mon Sep 17 00:00:00 2001 From: ccremers Date: Fri, 30 Dec 2005 15:11:39 +0000 Subject: [PATCH] - Fixed typo in --help (noted by Sjouke) - State-space should generate classes. --- src/switches.c | 35 ++++++++++++++++++----------------- src/todo.txt | 2 ++ 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/src/switches.c b/src/switches.c index 2243d66..120e3b4 100644 --- a/src/switches.c +++ b/src/switches.c @@ -505,22 +505,6 @@ switcher (const int process, int index, int commandline) } } - if (detect ('s', "state-space", 0)) - { - if (!process) - { - helptext ("-s, --state-space", - "ignore any existing claims and add 'reachable' claims to generate the full state space"); - } - else - { - switches.removeclaims = true; // remove parsed claims - switches.addreachableclaim = true; // add reachability claims - switches.prune = 0; // do not prune anything - return index; - } - } - if (detect ('C', "class", 0)) { if (!process) @@ -535,6 +519,23 @@ switcher (const int process, int index, int commandline) } } + if (detect ('s', "state-space", 0)) + { + if (!process) + { + helptext ("-s, --state-space", + "ignore any existing claims and add 'reachable' claims. Generate full state space classes."); + } + else + { + switches.removeclaims = true; // remove parsed claims + switches.addreachableclaim = true; // add reachability claims + switches.prune = 0; // do not prune anything + switches.concrete = false; // show classes + return index; + } + } + if (detect (' ', "concrete", 0)) { if (!process) @@ -627,7 +628,7 @@ switcher (const int process, int index, int commandline) { if (!process) { - helptext ("-A,- -all-attacks", + helptext ("-A, --all-attacks", "generate all attacks within the state space instead of just one"); } else diff --git a/src/todo.txt b/src/todo.txt index ccd7d92..2980a15 100644 --- a/src/todo.txt +++ b/src/todo.txt @@ -1,3 +1,5 @@ +- Scyther binary in www-ccremers hangen voor Sjouke, want daar update + hij de boel van. - Maybe add warning for type of matching in the output, maybe stderr. - SConstruct file should check whether ctags actually exists (avoiding errors)