Skip to content

Commit a4389fe

Browse files
tautschnigtautschnig
authored
Merge pull request diffblue#2210 from tautschnig/verbosity-cleanup
Verbosity parsing/handling cleanup
2 parents c250880 + 215cd69 commit a4389fe

24 files changed

+77
-199
lines changed

‎jbmc/src/janalyzer/janalyzer_parse_options.cpp

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ Author: Daniel Kroening, [email protected]
5151
#include <util/config.h>
5252
#include <util/exit_codes.h>
5353
#include <util/options.h>
54-
#include <util/string2int.h>
5554
#include <util/unicode.h>
5655

5756
#include <cbmc/version.h>
@@ -74,21 +73,6 @@ void janalyzer_parse_optionst::register_languages()
7473
register_language(new_java_bytecode_language);
7574
}
7675

77-
void janalyzer_parse_optionst::eval_verbosity()
78-
{
79-
// this is our default verbosity
80-
unsigned int v = messaget::M_STATISTICS;
81-
82-
if(cmdline.isset("verbosity"))
83-
{
84-
v = unsafe_string2unsigned(cmdline.get_value("verbosity"));
85-
if(v > 10)
86-
v = 10;
87-
}
88-
89-
ui_message_handler.set_verbosity(v);
90-
}
91-
9276
void janalyzer_parse_optionst::get_command_line_options(optionst &options)
9377
{
9478
if(config.set(cmdline))
@@ -356,7 +340,8 @@ int janalyzer_parse_optionst::doit()
356340

357341
optionst options;
358342
get_command_line_options(options);
359-
eval_verbosity();
343+
eval_verbosity(
344+
cmdline.get_value("verbosity"), messaget::M_STATISTICS, ui_message_handler);
360345

361346
//
362347
// Print a banner

‎jbmc/src/janalyzer/janalyzer_parse_options.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,6 @@ class janalyzer_parse_optionst : public parse_options_baset, public messaget
173173

174174
ai_baset *build_analyzer(const optionst &, const namespacet &ns);
175175

176-
void eval_verbosity();
177-
178176
ui_message_handlert::uit get_ui()
179177
{
180178
return ui_message_handler.get_ui();

‎jbmc/src/jbmc/jbmc_parse_options.cpp

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ Author: Daniel Kroening, [email protected]
1717
#include <memory>
1818

1919
#include <util/exit_codes.h>
20-
#include <util/string2int.h>
2120
#include <util/config.h>
2221
#include <util/unicode.h>
2322
#include <util/invariant.h>
@@ -82,21 +81,6 @@ ::jbmc_parse_optionst::jbmc_parse_optionst(
8281
{
8382
}
8483

85-
void jbmc_parse_optionst::eval_verbosity()
86-
{
87-
// this is our default verbosity
88-
unsigned int v=messaget::M_STATISTICS;
89-
90-
if(cmdline.isset("verbosity"))
91-
{
92-
v=unsafe_string2unsigned(cmdline.get_value("verbosity"));
93-
if(v>10)
94-
v=10;
95-
}
96-
97-
ui_message_handler.set_verbosity(v);
98-
}
99-
10084
void jbmc_parse_optionst::get_command_line_options(optionst &options)
10185
{
10286
if(config.set(cmdline))
@@ -443,7 +427,8 @@ int jbmc_parse_optionst::doit()
443427
return 6; // should contemplate EX_SOFTWARE from sysexits.h
444428
}
445429

446-
eval_verbosity();
430+
eval_verbosity(
431+
cmdline.get_value("verbosity"), messaget::M_STATISTICS, ui_message_handler);
447432

448433
//
449434
// Print a banner

‎jbmc/src/jbmc/jbmc_parse_options.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ class jbmc_parse_optionst:
117117
object_factory_parameterst object_factory_params;
118118
bool stub_objects_are_not_null;
119119

120-
void eval_verbosity();
121120
void get_command_line_options(optionst &);
122121
int get_goto_program(
123122
std::unique_ptr<goto_modelt> &goto_model, const optionst &);

‎jbmc/src/jdiff/jdiff_parse_options.cpp

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ Author: Peter Schrammel
2020
#include <util/exit_codes.h>
2121
#include <util/make_unique.h>
2222
#include <util/options.h>
23-
#include <util/string2int.h>
2423

2524
#include <langapi/language.h>
2625

@@ -82,21 +81,6 @@ ::jdiff_parse_optionst::jdiff_parse_optionst(
8281
{
8382
}
8483

85-
void jdiff_parse_optionst::eval_verbosity()
86-
{
87-
// this is our default verbosity
88-
unsigned int v = messaget::M_STATISTICS;
89-
90-
if(cmdline.isset("verbosity"))
91-
{
92-
v = unsafe_string2unsigned(cmdline.get_value("verbosity"));
93-
if(v > 10)
94-
v = 10;
95-
}
96-
97-
ui_message_handler.set_verbosity(v);
98-
}
99-
10084
void jdiff_parse_optionst::get_command_line_options(optionst &options)
10185
{
10286
if(config.set(cmdline))
@@ -211,7 +195,8 @@ int jdiff_parse_optionst::doit()
211195

212196
optionst options;
213197
get_command_line_options(options);
214-
eval_verbosity();
198+
eval_verbosity(
199+
cmdline.get_value("verbosity"), messaget::M_STATISTICS, ui_message_handler);
215200

216201
//
217202
// Print a banner

‎jbmc/src/jdiff/jdiff_parse_options.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,6 @@ class jdiff_parse_optionst : public parse_options_baset, public jdiff_languagest
6666
virtual bool
6767
process_goto_program(const optionst &options, goto_modelt &goto_model);
6868

69-
void eval_verbosity();
70-
7169
void preprocessing();
7270
};
7371

‎src/cbmc/cbmc_parse_options.cpp

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ Author: Daniel Kroening, [email protected]
1616
#include <iostream>
1717
#include <memory>
1818

19-
#include <util/string2int.h>
2019
#include <util/config.h>
2120
#include <util/unicode.h>
2221
#include <util/invariant.h>
@@ -100,21 +99,6 @@ void cbmc_parse_optionst::set_default_options(optionst &options)
10099
options.set_option("arrays-uf", "auto");
101100
}
102101

103-
void cbmc_parse_optionst::eval_verbosity()
104-
{
105-
// this is our default verbosity
106-
unsigned int v=messaget::M_STATISTICS;
107-
108-
if(cmdline.isset("verbosity"))
109-
{
110-
v=unsafe_string2unsigned(cmdline.get_value("verbosity"));
111-
if(v>10)
112-
v=10;
113-
}
114-
115-
ui_message_handler.set_verbosity(v);
116-
}
117-
118102
void cbmc_parse_optionst::get_command_line_options(optionst &options)
119103
{
120104
if(config.set(cmdline))
@@ -435,7 +419,8 @@ int cbmc_parse_optionst::doit()
435419
return CPROVER_EXIT_EXCEPTION;
436420
}
437421

438-
eval_verbosity();
422+
eval_verbosity(
423+
cmdline.get_value("verbosity"), messaget::M_STATISTICS, ui_message_handler);
439424

440425
//
441426
// Print a banner

‎src/cbmc/cbmc_parse_options.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ class cbmc_parse_optionst:
112112
ui_message_handlert ui_message_handler;
113113
const path_strategy_choosert path_strategy_chooser;
114114

115-
void eval_verbosity();
116115
void register_languages();
117116
void get_command_line_options(optionst &);
118117
void preprocessing();

‎src/clobber/clobber_parse_options.cpp

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ Author: Daniel Kroening, [email protected]
1515
#include <fstream>
1616
#include <cstdlib>
1717

18-
#include <util/string2int.h>
1918
#include <util/config.h>
2019
#include <util/options.h>
2120
#include <util/memory_info.h>
@@ -45,23 +44,6 @@ clobber_parse_optionst::clobber_parse_optionst(int argc, const char **argv):
4544
{
4645
}
4746

48-
void clobber_parse_optionst::eval_verbosity()
49-
{
50-
// this is our default verbosity
51-
int v=messaget::M_STATISTICS;
52-
53-
if(cmdline.isset("verbosity"))
54-
{
55-
v=unsafe_string2int(cmdline.get_value("verbosity"));
56-
if(v<0)
57-
v=0;
58-
else if(v>10)
59-
v=10;
60-
}
61-
62-
ui_message_handler.set_verbosity(v);
63-
}
64-
6547
void clobber_parse_optionst::get_command_line_options(optionst &options)
6648
{
6749
if(config.set(cmdline))
@@ -115,7 +97,8 @@ int clobber_parse_optionst::doit()
11597
optionst options;
11698
get_command_line_options(options);
11799

118-
eval_verbosity();
100+
eval_verbosity(
101+
cmdline.get_value("verbosity"), messaget::M_STATISTICS, ui_message_handler);
119102

120103
goto_modelt goto_model;
121104

‎src/clobber/clobber_parse_options.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,6 @@ class clobber_parse_optionst:
6666
void report_success();
6767
void report_failure();
6868
void show_counterexample(const class goto_tracet &);
69-
70-
void eval_verbosity();
7169
};
7270

7371
#endif // CPROVER_CLOBBER_CLOBBER_PARSE_OPTIONS_H

‎src/goto-analyzer/goto_analyzer_parse_options.cpp

Lines changed: 2 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ Author: Daniel Kroening, [email protected]
4747

4848
#include <util/options.h>
4949
#include <util/config.h>
50-
#include <util/string2int.h>
5150
#include <util/unicode.h>
5251
#include <util/exit_codes.h>
5352

@@ -76,21 +75,6 @@ void goto_analyzer_parse_optionst::register_languages()
7675
register_language(new_jsil_language);
7776
}
7877

79-
void goto_analyzer_parse_optionst::eval_verbosity()
80-
{
81-
// this is our default verbosity
82-
unsigned int v=messaget::M_STATISTICS;
83-
84-
if(cmdline.isset("verbosity"))
85-
{
86-
v=unsafe_string2unsigned(cmdline.get_value("verbosity"));
87-
if(v>10)
88-
v=10;
89-
}
90-
91-
ui_message_handler.set_verbosity(v);
92-
}
93-
9478
void goto_analyzer_parse_optionst::get_command_line_options(optionst &options)
9579
{
9680
if(config.set(cmdline))
@@ -381,7 +365,8 @@ int goto_analyzer_parse_optionst::doit()
381365

382366
optionst options;
383367
get_command_line_options(options);
384-
eval_verbosity();
368+
eval_verbosity(
369+
cmdline.get_value("verbosity"), messaget::M_STATISTICS, ui_message_handler);
385370

386371
//
387372
// Print a banner

‎src/goto-analyzer/goto_analyzer_parse_options.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,6 @@ class goto_analyzer_parse_optionst:
175175

176176
ai_baset *build_analyzer(const optionst &, const namespacet &ns);
177177

178-
void eval_verbosity();
179-
180178
ui_message_handlert::uit get_ui()
181179
{
182180
return ui_message_handler.get_ui();

‎src/goto-cc/armcc_mode.cpp

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ Author: CM Wintersteiger, 2006
2121

2222
#include <iostream>
2323

24-
#include <util/string2int.h>
2524
#include <util/message.h>
2625
#include <util/prefix.h>
2726
#include <util/config.h>
@@ -37,8 +36,6 @@ int armcc_modet::doit()
3736
return EX_OK;
3837
}
3938

40-
unsigned int verbosity=1;
41-
4239
compilet compiler(cmdline, message_handler, cmdline.isset("diag_error="));
4340

4441
#if 0
@@ -49,11 +46,8 @@ int armcc_modet::doit()
4946
has_prefix(base_name, "goto-link");
5047
#endif
5148

52-
if(cmdline.isset("verbosity"))
53-
verbosity=unsafe_string2int(cmdline.get_value("verbosity"));
54-
55-
compiler.set_message_handler(get_message_handler());
56-
message_handler.set_verbosity(verbosity);
49+
const auto verbosity = eval_verbosity(
50+
cmdline.get_value("verbosity"), messaget::M_ERROR, message_handler);
5751

5852
debug() << "ARM mode" << eom;
5953

@@ -136,7 +130,7 @@ int armcc_modet::doit()
136130
compiler.output_file_executable="a.out";
137131
}
138132

139-
if(verbosity>8)
133+
if(verbosity > messaget::M_STATISTICS)
140134
{
141135
std::list<std::string>::iterator it;
142136

‎src/goto-cc/as_mode.cpp

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ Author: Michael Tautschnig
2424
#include <cstring>
2525

2626
#include <util/run.h>
27-
#include <util/string2int.h>
2827
#include <util/tempdir.h>
2928
#include <util/config.h>
3029
#include <util/get_base_name.h>
@@ -76,8 +75,6 @@ int as_modet::doit()
7675
return EX_OK;
7776
}
7877

79-
unsigned int verbosity=1;
80-
8178
bool act_as_as86=
8279
base_name=="as86" ||
8380
base_name.find("goto-as86")!=std::string::npos;
@@ -101,13 +98,10 @@ int as_modet::doit()
10198
return EX_OK; // Exit!
10299
}
103100

104-
if(cmdline.isset("w-") || cmdline.isset("warn"))
105-
verbosity=2;
106-
107-
if(cmdline.isset("verbosity"))
108-
verbosity=unsafe_string2unsigned(cmdline.get_value("verbosity"));
109-
110-
message_handler.set_verbosity(verbosity);
101+
auto default_verbosity = (cmdline.isset("w-") || cmdline.isset("warn")) ?
102+
messaget::M_WARNING : messaget::M_ERROR;
103+
eval_verbosity(
104+
cmdline.get_value("verbosity"), default_verbosity, message_handler);
111105

112106
if(act_as_as86)
113107
{

0 commit comments

Comments
 (0)