language_filest is not a messaget

Pass a message handler as an argument to several of its functions, but do not
construct a messaget object without a configured message handler as that is
deprecated.

Author: tautschnig

jbmc/src/java_bytecode/lazy_goto_functions_map.h

@@ -191,6 +191,14 @@ class lazy_goto_functions_mapt final
     // Second chance: see if language_filest can provide a body:
     if(!body_provided)
     {
+<<<<<<< HEAD:jbmc/src/java_bytecode/lazy_goto_functions_map.h
+=======
+      // Fill in symbol table entry body if not already done
+      language_files.convert_lazy_method(
+        name, function_symbol_table, message_handler);
+      body_provided = function_symbol_table.lookup_ref(name).value.is_not_nil();
+
+>>>>>>> language_filest is not a messaget:src/goto-programs/lazy_goto_functions_map.h
       // Create goto_functiont
       goto_convert_functionst convert_functions(
         function_symbol_table, message_handler);

jbmc/src/java_bytecode/lazy_goto_model.cpp

@@ -57,7 +57,6 @@ lazy_goto_modelt::lazy_goto_modelt(
       driver_program_generate_function_body),
     message_handler(message_handler)
 {
-  language_files.set_message_handler(message_handler);
 }
 
 lazy_goto_modelt::lazy_goto_modelt(lazy_goto_modelt &&other)
@@ -207,7 +206,7 @@ void lazy_goto_modelt::initialize(
 
     msg.status() << "Converting" << messaget::eom;
 
-    if(language_files.typecheck(symbol_table))
+    if(language_files.typecheck(symbol_table, message_handler))
     {
       throw invalid_source_file_exceptiont("CONVERSION ERROR");
     }
@@ -258,7 +257,11 @@ void lazy_goto_modelt::initialize(
     // Allow all language front-ends to try to provide the user-specified
     // (--function) entry-point, or some language-specific default:
     entry_point_generation_failed =
+<<<<<<< HEAD:jbmc/src/java_bytecode/lazy_goto_model.cpp
       language_files.generate_support_functions(symbol_table);
+=======
+      language_files.generate_support_functions(symbol_table, message_handler);
+>>>>>>> language_filest is not a messaget:src/goto-programs/lazy_goto_model.cpp
   }
 
   if(entry_point_generation_failed)

src/goto-cc/compile.cpp

@@ -603,13 +603,16 @@ bool compilet::write_bin_object_file(
 bool compilet::parse_source(const std::string &file_name)
 {
   language_filest language_files;
-  language_files.set_message_handler(get_message_handler());
 
   if(parse(file_name, language_files))
     return true;
 
   // we just typecheck one file here
+<<<<<<< HEAD
   if(language_files.typecheck(goto_model.symbol_table, keep_file_local))
+=======
+  if(language_files.typecheck(goto_model.symbol_table, get_message_handler()))
+>>>>>>> language_filest is not a messaget
   {
     error() << "CONVERSION ERROR" << eom;
     return true;

src/goto-programs/initialize_goto_model.cpp

@@ -83,7 +83,6 @@ goto_modelt initialize_goto_model(
   }
 
   language_filest language_files;
-  language_files.set_message_handler(message_handler);
 
   goto_modelt goto_model;
 
@@ -127,7 +126,7 @@ goto_modelt initialize_goto_model(
 
     msg.status() << "Converting" << messaget::eom;
 
-    if(language_files.typecheck(goto_model.symbol_table))
+    if(language_files.typecheck(goto_model.symbol_table, message_handler))
     {
       throw invalid_source_file_exceptiont("CONVERSION ERROR");
     }
@@ -169,6 +168,7 @@ goto_modelt initialize_goto_model(
   }
   else if(!binaries_provided_start)
   {
+<<<<<<< HEAD
     if(options.is_set("function"))
     {
       // no entry point is present; Use the mode of the specified entry function
@@ -183,6 +183,12 @@ goto_modelt initialize_goto_model(
       entry_point_generation_failed =
         language_files.generate_support_functions(goto_model.symbol_table);
     }
+=======
+    // Allow all language front-ends to try to provide the user-specified
+    // (--function) entry-point, or some language-specific default:
+    entry_point_generation_failed = language_files.generate_support_functions(
+      goto_model.symbol_table, message_handler);
+>>>>>>> language_filest is not a messaget
   }
 
   if(entry_point_generation_failed)

src/langapi/language_file.cpp

@@ -10,6 +10,7 @@ Author: Daniel Kroening, [email protected]
 
 #include <fstream>
 
+#include <util/message.h>
 #include <util/object_factory_parameters.h>
 
 #include "language.h"
@@ -45,14 +46,16 @@ void language_filet::convert_lazy_method(
   language->convert_lazy_method(id, symbol_table, message_handler);
 }
 
-void language_filest::show_parse(std::ostream &out)
+void language_filest::show_parse(std::ostream &out, message_handlert &message_handler)
 {
   for(const auto &file : file_map)
-    file.second.language->show_parse(out, get_message_handler());
+    file.second.language->show_parse(out, message_handler);
 }
 
-bool language_filest::parse()
+bool language_filest::parse(message_handlert &message_handler)
 {
+  messaget log(message_handler);
+
   for(auto &file : file_map)
   {
     // open file
@@ -61,17 +64,17 @@ bool language_filest::parse()
 
     if(!infile)
     {
-      error() << "Failed to open " << file.first << eom;
+      log.error() << "Failed to open " << file.first << messaget::eom;
       return true;
     }
 
     // parse it
 
     languaget &language=*(file.second.language);
 
-    if(language.parse(infile, file.first, get_message_handler()))
+    if(language.parse(infile, file.first, message_handler))
     {
-      error() << "Parsing of " << file.first << " failed" << eom;
+      log.error() << "Parsing of " << file.first << " failed" << messaget::eom;
       return true;
     }
 
@@ -85,13 +88,17 @@ bool language_filest::parse()
 
 bool language_filest::typecheck(
   symbol_tablet &symbol_table,
+<<<<<<< HEAD
   const bool keep_file_local)
+=======
+  message_handlert &message_handler)
+>>>>>>> language_filest is not a messaget
 {
   // typecheck interfaces
 
   for(auto &file : file_map)
   {
-    if(file.second.language->interfaces(symbol_table, get_message_handler()))
+    if(file.second.language->interfaces(symbol_table, message_handler))
       return true;
   }
 
@@ -132,6 +139,7 @@ bool language_filest::typecheck(
   {
     if(file.second.modules.empty())
     {
+<<<<<<< HEAD
 <<<<<<< HEAD
       if(file.second.language->can_keep_file_local())
       {
@@ -146,6 +154,9 @@ bool language_filest::typecheck(
 =======
       if(file.second.language->typecheck(
            symbol_table, "", get_message_handler()))
+=======
+      if(file.second.language->typecheck(symbol_table, "", message_handler))
+>>>>>>> language_filest is not a messaget
         return true;
 >>>>>>> languaget is not a messaget
       // register lazy methods.
@@ -162,23 +173,28 @@ bool language_filest::typecheck(
 
   for(auto &module : module_map)
   {
+<<<<<<< HEAD
     if(typecheck_module(symbol_table, module.second, keep_file_local))
+=======
+    if(typecheck_module(symbol_table, module.second, message_handler))
+>>>>>>> language_filest is not a messaget
       return true;
   }
 
   return false;
 }
 
 bool language_filest::generate_support_functions(
-  symbol_tablet &symbol_table)
+  symbol_tablet &symbol_table,
+  message_handlert &message_handler)
 {
   std::set<std::string> languages;
 
   for(auto &file : file_map)
   {
     if(languages.insert(file.second.language->id()).second)
       if(file.second.language->generate_support_functions(
-           symbol_table, get_message_handler()))
+           symbol_table, message_handler))
         return true;
   }
 
@@ -200,11 +216,12 @@ bool language_filest::final(symbol_table_baset &symbol_table)
 }
 
 bool language_filest::interfaces(
-  symbol_tablet &symbol_table)
+  symbol_tablet &symbol_table,
+  message_handlert &message_handler)
 {
   for(auto &file : file_map)
   {
-    if(file.second.language->interfaces(symbol_table, get_message_handler()))
+    if(file.second.language->interfaces(symbol_table, message_handler))
       return true;
   }
 
@@ -214,36 +231,52 @@ bool language_filest::interfaces(
 bool language_filest::typecheck_module(
   symbol_tablet &symbol_table,
   const std::string &module,
+<<<<<<< HEAD
   const bool keep_file_local)
+=======
+  message_handlert &message_handler)
+>>>>>>> language_filest is not a messaget
 {
   // check module map
 
   module_mapt::iterator it=module_map.find(module);
 
   if(it==module_map.end())
   {
-    error() << "found no file that provides module " << module << eom;
+    messaget log(message_handler);
+    log.error() << "found no file that provides module " << module
+                << messaget::eom;
     return true;
   }
 
+<<<<<<< HEAD
   return typecheck_module(symbol_table, it->second, keep_file_local);
+=======
+  return typecheck_module(symbol_table, it->second, message_handler);
+>>>>>>> language_filest is not a messaget
 }
 
 bool language_filest::typecheck_module(
   symbol_tablet &symbol_table,
   language_modulet &module,
+<<<<<<< HEAD
   const bool keep_file_local)
+=======
+  message_handlert &message_handler)
+>>>>>>> language_filest is not a messaget
 {
   // already typechecked?
 
   if(module.type_checked)
     return false;
 
+  messaget log(message_handler);
+
   // already in progress?
 
   if(module.in_progress)
   {
-    error() << "circular dependency in " << module.name << eom;
+    log.error() << "circular dependency in " << module.name << messaget::eom;
     return true;
   }
 
@@ -260,21 +293,31 @@ bool language_filest::typecheck_module(
       it!=dependency_set.end();
       it++)
   {
+<<<<<<< HEAD
     module.in_progress = !typecheck_module(symbol_table, *it, keep_file_local);
     if(module.in_progress == false)
+=======
+    if(typecheck_module(symbol_table, *it, message_handler))
+    {
+      module.in_progress=false;
+>>>>>>> language_filest is not a messaget
       return true;
   }
 
   // type check it
 
-  status() << "Type-checking " << module.name << eom;
+  log.status() << "Type-checking " << module.name << messaget::eom;
 
 <<<<<<< HEAD
   if(module.file->language->can_keep_file_local())
 =======
   if(module.file->language->typecheck(
+<<<<<<< HEAD
        symbol_table, module.name, get_message_handler()))
 >>>>>>> languaget is not a messaget
+=======
+       symbol_table, module.name, message_handler))
+>>>>>>> language_filest is not a messaget
   {
     module.in_progress = !module.file->language->typecheck(
       symbol_table, module.name, keep_file_local);