Merge pull request #5616 from tautschnig/messaget-compilet

compilet isn't a messaget

Author: tautschnig

src/goto-cc/compile.cpp

@@ -68,34 +68,37 @@ bool compilet::doit()
   {
     if(!find_library(library))
       // GCC is going to complain if this doesn't exist
-      debug() << "Library not found: " << library << " (ignoring)" << eom;
+      log.debug() << "Library not found: " << library << " (ignoring)"
+                  << messaget::eom;
   }
 
-  statistics() << "No. of source files: " << source_files.size() << eom;
-  statistics() << "No. of object files: " << object_files.size() << eom;
+  log.statistics() << "No. of source files: " << source_files.size()
+                   << messaget::eom;
+  log.statistics() << "No. of object files: " << object_files.size()
+                   << messaget::eom;
 
   // Work through the given source files
 
   if(source_files.empty() && object_files.empty())
   {
-    error() << "no input files" << eom;
+    log.error() << "no input files" << messaget::eom;
     return true;
   }
 
   if(mode==LINK_LIBRARY && !source_files.empty())
   {
-    error() << "cannot link source files" << eom;
+    log.error() << "cannot link source files" << messaget::eom;
     return true;
   }
 
   if(mode==PREPROCESS_ONLY && !object_files.empty())
   {
-    error() << "cannot preprocess object files" << eom;
+    log.error() << "cannot preprocess object files" << messaget::eom;
     return true;
   }
 
-  const unsigned warnings_before=
-    get_message_handler().get_message_count(messaget::M_WARNING);
+  const unsigned warnings_before =
+    log.get_message_handler().get_message_count(messaget::M_WARNING);
 
   auto symbol_table_opt = compile();
   if(!symbol_table_opt.has_value())
@@ -109,10 +112,8 @@ bool compilet::doit()
       return true;
   }
 
-  return
-    warning_is_fatal &&
-    get_message_handler().get_message_count(messaget::M_WARNING)!=
-    warnings_before;
+  return warning_is_fatal && log.get_message_handler().get_message_count(
+                               messaget::M_WARNING) != warnings_before;
 }
 
 enum class file_typet
@@ -169,22 +170,23 @@ static file_typet detect_file_type(
 /// \return false on success, true on error.
 bool compilet::add_input_file(const std::string &file_name)
 {
-  switch(detect_file_type(file_name, get_message_handler()))
+  switch(detect_file_type(file_name, log.get_message_handler()))
   {
   case file_typet::FAILED_TO_OPEN_FILE:
-    warning() << "failed to open file '" << file_name
-              << "': " << std::strerror(errno) << eom;
+    log.warning() << "failed to open file '" << file_name
+                  << "': " << std::strerror(errno) << messaget::eom;
     return warning_is_fatal; // generously ignore unless -Werror
 
   case file_typet::UNKNOWN:
     // unknown extension, not a goto binary, will silently ignore
-    debug() << "unknown file type in '" << file_name << "'" << eom;
+    log.debug() << "unknown file type in '" << file_name << "'"
+                << messaget::eom;
     return false;
 
   case file_typet::ELF_OBJECT:
     // ELF file without goto-cc section, silently ignore
-    debug() << "ELF object without goto-cc section: '" << file_name << "'"
-            << eom;
+    log.debug() << "ELF object without goto-cc section: '" << file_name << "'"
+                << messaget::eom;
     return false;
 
   case file_typet::SOURCE_FILE:
@@ -225,7 +227,7 @@ bool compilet::add_files_from_archive(
       run("ar", {"ar", "x", concat_dir_file(working_directory, file_name)});
     if(ret != 0)
     {
-      error() << "Failed to extract archive " << file_name << eom;
+      log.error() << "Failed to extract archive " << file_name << messaget::eom;
       return true;
     }
   }
@@ -240,7 +242,7 @@ bool compilet::add_files_from_archive(
     "");
   if(ret != 0)
   {
-    error() << "Failed to list archive " << file_name << eom;
+    log.error() << "Failed to list archive " << file_name << messaget::eom;
     return true;
   }
 
@@ -251,10 +253,11 @@ bool compilet::add_files_from_archive(
   {
     std::string t = concat_dir_file(tstr, line);
 
-    if(is_goto_binary(t, get_message_handler()))
+    if(is_goto_binary(t, log.get_message_handler()))
       object_files.push_back(t);
     else
-      debug() << "Object file is not a goto binary: " << line << eom;
+      log.debug() << "Object file is not a goto binary: " << line
+                  << messaget::eom;
   }
 
   if(!thin_archive)
@@ -282,14 +285,14 @@ bool compilet::find_library(const std::string &name)
     {
       library_file_name = concat_dir_file(library_path, "lib" + name + ".so");
 
-      switch(detect_file_type(library_file_name, get_message_handler()))
+      switch(detect_file_type(library_file_name, log.get_message_handler()))
       {
       case file_typet::GOTO_BINARY:
         return !add_input_file(library_file_name);
 
       case file_typet::ELF_OBJECT:
-        warning() << "Warning: Cannot read ELF library " << library_file_name
-                  << eom;
+        log.warning() << "Warning: Cannot read ELF library "
+                      << library_file_name << messaget::eom;
         return warning_is_fatal;
 
       case file_typet::THIN_ARCHIVE:
@@ -310,7 +313,7 @@ bool compilet::find_library(const std::string &name)
 bool compilet::link(optionalt<symbol_tablet> &&symbol_table)
 {
   // "compile" hitherto uncompiled functions
-  statistics() << "Compiling functions" << eom;
+  log.statistics() << "Compiling functions" << messaget::eom;
   goto_modelt goto_model;
   if(symbol_table.has_value())
     goto_model.symbol_table = std::move(*symbol_table);
@@ -319,7 +322,7 @@ bool compilet::link(optionalt<symbol_tablet> &&symbol_table)
   // parse object files
   for(const auto &file_name : object_files)
   {
-    if(read_object_and_link(file_name, goto_model, get_message_handler()))
+    if(read_object_and_link(file_name, goto_model, log.get_message_handler()))
       return true;
   }
 
@@ -338,7 +341,7 @@ bool compilet::link(optionalt<symbol_tablet> &&symbol_table)
 
     const bool error = ansi_c_entry_point(
       goto_model.symbol_table,
-      get_message_handler(),
+      log.get_message_handler(),
       c_object_factory_parameterst());
 
     if(error)
@@ -351,7 +354,7 @@ bool compilet::link(optionalt<symbol_tablet> &&symbol_table)
   if(keep_file_local)
   {
     function_name_manglert<file_name_manglert> mangler(
-      get_message_handler(), goto_model, file_local_mangle_suffix);
+      log.get_message_handler(), goto_model, file_local_mangle_suffix);
     mangler.mangle();
   }
 
@@ -389,7 +392,7 @@ optionalt<symbol_tablet> compilet::compile()
         std::ifstream in(file_name, std::ios::binary);
         std::ofstream out(debug_outfile, std::ios::binary);
         out << in.rdbuf();
-        warning() << "Failed sources in " << debug_outfile << eom;
+        log.warning() << "Failed sources in " << debug_outfile << messaget::eom;
       }
 
       return {}; // parser/typecheck error
@@ -422,7 +425,7 @@ optionalt<symbol_tablet> compilet::compile()
       if(keep_file_local)
       {
         function_name_manglert<file_name_manglert> mangler(
-          get_message_handler(), file_goto_model, file_local_mangle_suffix);
+          log.get_message_handler(), file_goto_model, file_local_mangle_suffix);
         mangler.mangle();
       }
 
@@ -434,7 +437,7 @@ optionalt<symbol_tablet> compilet::compile()
     }
     else
     {
-      if(linking(symbol_table, *file_symbol_table, get_message_handler()))
+      if(linking(symbol_table, *file_symbol_table, log.get_message_handler()))
       {
         return {};
       }
@@ -467,11 +470,12 @@ bool compilet::parse(
 
   if(languagep==nullptr)
   {
-    error() << "failed to figure out type of file '" << file_name << "'" << eom;
+    log.error() << "failed to figure out type of file '" << file_name << "'"
+                << messaget::eom;
     return true;
   }
 
-  languagep->set_message_handler(get_message_handler());
+  languagep->set_message_handler(log.get_message_handler());
 
   if(file_name == "-")
     return parse_stdin(*languagep);
@@ -484,7 +488,8 @@ bool compilet::parse(
 
   if(!infile)
   {
-    error() << "failed to open input file '" << file_name << "'" << eom;
+    log.error() << "failed to open input file '" << file_name << "'"
+                << messaget::eom;
     return true;
   }
 
@@ -493,7 +498,7 @@ bool compilet::parse(
 
   if(mode==PREPROCESS_ONLY)
   {
-    statistics() << "Preprocessing: " << file_name << eom;
+    log.statistics() << "Preprocessing: " << file_name << messaget::eom;
 
     std::ostream *os = &std::cout;
     std::ofstream ofs;
@@ -505,8 +510,8 @@ bool compilet::parse(
 
       if(!ofs.is_open())
       {
-        error() << "failed to open output file '" << cmdline.get_value('o')
-                << "'" << eom;
+        log.error() << "failed to open output file '" << cmdline.get_value('o')
+                    << "'" << messaget::eom;
         return true;
       }
     }
@@ -515,11 +520,11 @@ bool compilet::parse(
   }
   else
   {
-    statistics() << "Parsing: " << file_name << eom;
+    log.statistics() << "Parsing: " << file_name << messaget::eom;
 
     if(lf.language->parse(infile, file_name))
     {
-      error() << "PARSING ERROR" << eom;
+      log.error() << "PARSING ERROR" << messaget::eom;
       return true;
     }
   }
@@ -533,7 +538,7 @@ bool compilet::parse(
 /// \return true on error, false otherwise
 bool compilet::parse_stdin(languaget &language)
 {
-  statistics() << "Parsing: (stdin)" << eom;
+  log.statistics() << "Parsing: (stdin)" << messaget::eom;
 
   if(mode==PREPROCESS_ONLY)
   {
@@ -547,8 +552,8 @@ bool compilet::parse_stdin(languaget &language)
 
       if(!ofs.is_open())
       {
-        error() << "failed to open output file '" << cmdline.get_value('o')
-                << "'" << eom;
+        log.error() << "failed to open output file '" << cmdline.get_value('o')
+                    << "'" << messaget::eom;
         return true;
       }
     }
@@ -559,7 +564,7 @@ bool compilet::parse_stdin(languaget &language)
   {
     if(language.parse(std::cin, ""))
     {
-      error() << "PARSING ERROR" << eom;
+      log.error() << "PARSING ERROR" << messaget::eom;
       return true;
     }
   }
@@ -616,7 +621,7 @@ bool compilet::write_bin_object_file(
 optionalt<symbol_tablet> compilet::parse_source(const std::string &file_name)
 {
   language_filest language_files;
-  language_files.set_message_handler(get_message_handler());
+  language_files.set_message_handler(log.get_message_handler());
 
   if(parse(file_name, language_files))
     return {};
@@ -625,13 +630,13 @@ optionalt<symbol_tablet> compilet::parse_source(const std::string &file_name)
   symbol_tablet file_symbol_table;
   if(language_files.typecheck(file_symbol_table, keep_file_local))
   {
-    error() << "CONVERSION ERROR" << eom;
+    log.error() << "CONVERSION ERROR" << messaget::eom;
     return {};
   }
 
   if(language_files.final(file_symbol_table))
   {
-    error() << "CONVERSION ERROR" << eom;
+    log.error() << "CONVERSION ERROR" << messaget::eom;
     return {};
   }
 
@@ -641,7 +646,7 @@ optionalt<symbol_tablet> compilet::parse_source(const std::string &file_name)
 /// constructor
 /// \return nothing
 compilet::compilet(cmdlinet &_cmdline, message_handlert &mh, bool Werror)
-  : messaget(mh),
+  : log(mh),
     cmdline(_cmdline),
     warning_is_fatal(Werror),
     keep_file_local(
@@ -657,9 +662,12 @@ compilet::compilet(cmdlinet &_cmdline, message_handlert &mh, bool Werror)
   working_directory=get_current_working_directory();
 
   if(cmdline.isset("export-function-local-symbols"))
-    warning() << "The `--export-function-local-symbols` flag is deprecated. "
-                 "Please use `--export-file-local-symbols` instead."
-              << eom;
+  {
+    log.warning()
+      << "The `--export-function-local-symbols` flag is deprecated. "
+         "Please use `--export-file-local-symbols` instead."
+      << messaget::eom;
+  }
 }
 
 /// cleans up temporary files
@@ -695,7 +703,7 @@ void compilet::convert_symbols(goto_modelt &goto_model)
     symbol_table_buildert::wrap(goto_model.symbol_table);
 
   goto_convert_functionst converter(
-    symbol_table_builder, get_message_handler());
+    symbol_table_builder, log.get_message_handler());
 
   // the compilation may add symbols!
 
@@ -722,7 +730,7 @@ void compilet::convert_symbols(goto_modelt &goto_model)
         s_it->second.is_function() && !s_it->second.is_compiled() &&
         s_it->second.value.is_not_nil())
       {
-        debug() << "Compiling " << s_it->first << eom;
+        log.debug() << "Compiling " << s_it->first << messaget::eom;
         converter.convert_function(
           s_it->first, goto_model.goto_functions.function_map[s_it->first]);
         symbol_table_builder.get_writeable_ref(symbol).set_compiled();
@@ -746,10 +754,12 @@ bool compilet::add_written_cprover_symbols(const symbol_tablet &symbol_table)
 
     if(!inserted && old->second.type!=new_type)
     {
-      error() << "Incompatible CPROVER macro symbol types:" << eom
-              << old->second.type.pretty() << "(at " << old->second.location
-              << ")" << eom << "and" << eom << new_type.pretty()
-              << "(at " << pair.second.location << ")" << eom;
+      log.error() << "Incompatible CPROVER macro symbol types:" << '\n'
+                  << old->second.type.pretty() << "(at " << old->second.location
+                  << ")\n"
+                  << "and\n"
+                  << new_type.pretty() << "(at " << pair.second.location << ")"
+                  << messaget::eom;
       return true;
     }
   }