[apparmor] [PATCH 14/20] Add -D stats and -D progress options

[John Johansen]

add short options to turn on all stats, and all progress indicators,
also allow adding "no-" prefix to dump options to allow subtracting
individual options when short options are used.

eg.
  -D stats -D no-expr-simplify

Signed-off-by: John Johansen <john.johansen at canonical.com>
---
 parser/parser_main.c |   36 +++++++++++++++++++++---------------
 1 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/parser/parser_main.c b/parser/parser_main.c
index 7641fbd..acdb193 100644
--- a/parser/parser_main.c
+++ b/parser/parser_main.c
@@ -191,28 +191,34 @@ typedef struct {
 } optflag_table_t;
 
 optflag_table_t dumpflag_table[] = {
-	{ 0, "rule-exprs", "Dump rule to expr tree conversions",
+	{ 1, "rule-exprs", "Dump rule to expr tree conversions",
 	  DFA_DUMP_RULE_EXPR },
-	{ 0, "expr-stats", "Dump stats on expr tree", DFA_DUMP_TREE_STATS },
-	{ 0, "expr-tree", "Dump expression tree", DFA_DUMP_TREE },
-	{ 0, "expr-simplified", "Dump simplified expression tree",
+	{ 1, "expr-stats", "Dump stats on expr tree", DFA_DUMP_TREE_STATS },
+	{ 1, "expr-tree", "Dump expression tree", DFA_DUMP_TREE },
+	{ 1, "expr-simplified", "Dump simplified expression tree",
 	  DFA_DUMP_SIMPLE_TREE },
-	{ 0, "dfa-progress", "Dump dfa creation as in progress",
+	{ 1, "stats", "Dump all compile stats",
+	  DFA_DUMP_TREE_STATS | DFA_DUMP_STATS | DFA_DUMP_TRANS_STATS |
+	  DFA_DUMP_EQUIV_STATS },
+	{ 1, "progress", "Dump progress for all compile phases",
+	  DFA_DUMP_PROGRESS | DFA_DUMP_STATS | DFA_DUMP_TRANS_PROGRESS |
+	  DFA_DUMP_TRANS_STATS },
+	{ 1, "dfa-progress", "Dump dfa creation as in progress",
 	  DFA_DUMP_PROGRESS | DFA_DUMP_STATS },
-	{ 0, "dfa-stats", "Dump dfa creation stats", DFA_DUMP_STATS },
-	{ 0, "dfa-states", "Dump dfa state diagram", DFA_DUMP_STATES },
-	{ 0, "dfa-graph", "Dump dfa dot (graphviz) graph", DFA_DUMP_GRAPH },
-	{ 0, "dfa-minimize", "Dump dfa minimization", DFA_DUMP_MINIMIZE },
-	{ 0, "dfa-unreachable", "Dump dfa unreachable states",
+	{ 1, "dfa-stats", "Dump dfa creation stats", DFA_DUMP_STATS },
+	{ 1, "dfa-states", "Dump dfa state diagram", DFA_DUMP_STATES },
+	{ 1, "dfa-graph", "Dump dfa dot (graphviz) graph", DFA_DUMP_GRAPH },
+	{ 1, "dfa-minimize", "Dump dfa minimization", DFA_DUMP_MINIMIZE },
+	{ 1, "dfa-unreachable", "Dump dfa unreachable states",
 	  DFA_DUMP_UNREACHABLE },
-	{ 0, "compress-progress", "Dump progress of compression",
+	{ 1, "compress-progress", "Dump progress of compression",
 	  DFA_DUMP_TRANS_PROGRESS | DFA_DUMP_TRANS_STATS },
-	{ 0, "compress-stats", "Dump stats on compression",
+	{ 1, "compress-stats", "Dump stats on compression",
 	  DFA_DUMP_TRANS_STATS },
-	{ 0, "compressed-dfa", "Dump compressed dfa", DFA_DUMP_TRANS_TABLE },
-	{ 0, "equiv-stats", "Dump equivance class stats",
+	{ 1, "compressed-dfa", "Dump compressed dfa", DFA_DUMP_TRANS_TABLE },
+	{ 1, "equiv-stats", "Dump equivance class stats",
 	  DFA_DUMP_EQUIV_STATS },
-	{ 0, "equiv", "Dump equivance class", DFA_DUMP_EQUIV },
+	{ 1, "equiv", "Dump equivance class", DFA_DUMP_EQUIV },
 	{ 0, NULL, NULL, 0 },
 };
 
-- 
1.7.1