fixes

Author: Daniel Kroening

src/hw-cbmc/hw_cbmc_parse_options.cpp

@@ -20,7 +20,7 @@ Author: Daniel Kroening, [email protected]
 #include <langapi/mode.h>
 
 #include "hw_cbmc_parse_options.h"
-#include "hw_bmc.h"
+//#include "hw_bmc.h"
 #include "map_vars.h"
 #include "gen_interface.h"
 
@@ -50,7 +50,9 @@ int hw_cbmc_parse_optionst::doit()
 
   optionst options;
   get_command_line_options(options);
-  eval_verbosity();
+
+  eval_verbosity(
+    cmdline.get_value("verbosity"), messaget::M_STATISTICS, ui_message_handler);
 
   //
   // Print a banner
@@ -68,8 +70,10 @@ int hw_cbmc_parse_optionst::doit()
   if(cmdline.isset("vcd"))
     options.set_option("vcd", cmdline.get_value("vcd"));
 
+  symbol_tablet symbol_table;
+
   cbmc_solverst cbmc_solvers(options, symbol_table, ui_message_handler);
-  cbmc_solvers.set_ui(get_ui());
+  cbmc_solvers.set_ui(ui_message_handler.get_ui());
   std::unique_ptr<cbmc_solverst::solvert> cbmc_solver;
 
   try
@@ -83,6 +87,7 @@ int hw_cbmc_parse_optionst::doit()
     return 1;
   }
 
+  #if 0
   prop_convt &prop_conv=cbmc_solver->prop_conv();
   hw_bmct hw_bmc(options, symbol_table, ui_message_handler, prop_conv);
 
@@ -110,6 +115,7 @@ int hw_cbmc_parse_optionst::doit()
 
   // do actual BMC
   return do_bmc(hw_bmc, goto_functions);
+  #endif
 }
 
 /*******************************************************************\
@@ -172,7 +178,8 @@ Function: hw_cbmc_parse_optionst::get_modules
 
 \*******************************************************************/
 
-int hw_cbmc_parse_optionst::get_modules(std::list<exprt> &bmc_constraints)
+int hw_cbmc_parse_optionst::get_modules(
+  std::list<exprt> &bmc_constraints)
 {
   //
   // unwinding of transition systems
@@ -229,7 +236,7 @@ int hw_cbmc_parse_optionst::get_modules(std::list<exprt> &bmc_constraints)
   }
   else if(cmdline.isset("show-modules"))
   {
-    show_modules(symbol_table, get_ui());
+    show_modules(symbol_table, ui_message_handler.get_ui());
     return 0; // done
   }