refactor DBG_ENABLED() vs. verbose

Always set 'verbose' when we are compiling a DEBUG build.

diff --git a/main.cc b/main.cc
index dc3f6f4dca002d6e763e5bbf25068260d3edc828..b6e41523c0084d3699c5083c7c5ce4ca3cbb94e6 100644 (file)
--- a/main.cc
+++ b/main.cc
@@ -22,7 +22,7 @@ static void param_defaults(struct model_params *params)
        params->bound = 0;
        params->maxfuturevalues = 0;
        params->expireslop = 10;
-       params->verbose = 0;
+       params->verbose = !!DBG_ENABLED();
 }
 
 static void print_usage(struct model_params *params)

diff --git a/model.cc b/model.cc
index 62550da7f4bd30398650b188ddc13dc1b82d1986..0a5cda59df858e8d4f35e74e7eb76929032bbefa 100644 (file)
--- a/model.cc
+++ b/model.cc
@@ -530,7 +530,7 @@ void ModelChecker::print_execution(bool printbugs) const
 {
        print_program_output();
 
-       if (DBG_ENABLED() || params.verbose) {
+       if (params.verbose) {
                model_print("Earliest divergence point since last feasible execution:\n");
                if (earliest_diverge)
                        earliest_diverge->print();
@@ -574,7 +574,7 @@ bool ModelChecker::next_execution()
        record_stats();
 
        /* Output */
-       if (DBG_ENABLED() || params.verbose || (complete && have_bug_reports()))
+       if (params.verbose || (complete && have_bug_reports()))
                print_execution(complete);
        else
                clear_program_output();