expand goto_programt and goto_functionst templates

src/analyses/constant_propagator.cpp

@@ -20,6 +20,8 @@ Author: Peter Schrammel
 #include <util/simplify_expr.h>
 #include <util/cprover_prefix.h>
 
+#include <langapi/language_util.h>
+
 void constant_propagator_domaint::assign_rec(
   valuest &values,
   const exprt &lhs,

src/analyses/custom_bitvector_analysis.cpp

@@ -14,6 +14,8 @@ Author: Daniel Kroening, [email protected]
 #include <util/xml_expr.h>
 #include <util/simplify_expr.h>
 
+#include <langapi/language_util.h>
+
 #include <iostream>
 
 void custom_bitvector_domaint::set_bit(

src/analyses/goto_check.cpp

@@ -28,6 +28,8 @@ Author: Daniel Kroening, [email protected]
 #include <util/cprover_prefix.h>
 #include <util/options.h>
 
+#include <langapi/language_util.h>
+
 #include "local_bitvector_analysis.h"
 
 class goto_checkt

src/analyses/goto_rw.cpp

@@ -23,6 +23,8 @@ Date: April 2010
 #include <util/simplify_expr.h>
 #include <util/make_unique.h>
 
+#include <langapi/language_util.h>
+
 #include <goto-programs/goto_functions.h>
 
 #include <pointer-analysis/goto_program_dereference.h>

src/analyses/interval_domain.cpp

@@ -13,6 +13,7 @@ Author: Daniel Kroening, [email protected]
 
 #ifdef DEBUG
 #include <iostream>
+#include <langapi/language_util.h>
 #endif
 
 #include <util/simplify_expr.h>

src/cbmc/bmc_cover.cpp

@@ -12,6 +12,7 @@ Author: Daniel Kroening, [email protected]
 #include "bmc.h"
 
 #include <chrono>
+#include <iomanip>
 
 #include <util/xml.h>
 #include <util/xml_expr.h>
@@ -25,6 +26,8 @@ Author: Daniel Kroening, [email protected]
 #include <goto-programs/xml_goto_trace.h>
 #include <goto-programs/json_goto_trace.h>
 
+#include <langapi/language_util.h>
+
 #include "bv_cbmc.h"
 
 class bmc_covert:

src/cbmc/symex_coverage.cpp

@@ -13,6 +13,7 @@ Date: March 2016
 
 #include "symex_coverage.h"
 
+#include <ctime>
 #include <chrono>
 #include <iostream>
 #include <fstream>
@@ -23,6 +24,8 @@ Date: March 2016
 #include <util/cprover_prefix.h>
 #include <util/prefix.h>
 
+#include <langapi/language_util.h>
+
 #include <goto-programs/goto_functions.h>
 #include <goto-programs/remove_returns.h>
 

src/goto-instrument/call_sequences.cpp

@@ -22,6 +22,8 @@ Date: April 2013
 
 #include <goto-programs/goto_model.h>
 
+#include <langapi/language_util.h>
+
 void show_call_sequences(
   const irep_idt &caller,
   const goto_programt &goto_program)

src/goto-instrument/cover_instrument_condition.cpp

@@ -11,6 +11,8 @@ Author: Daniel Kroening
 
 #include "cover_instrument.h"
 
+#include <langapi/language_util.h>
+
 #include "cover_util.h"
 
 void cover_condition_instrumentert::instrument(

src/goto-instrument/cover_instrument_decision.cpp

@@ -11,6 +11,8 @@ Author: Daniel Kroening
 
 #include "cover_instrument.h"
 
+#include <langapi/language_util.h>
+
 #include "cover_util.h"
 
 void cover_decision_instrumentert::instrument(

src/goto-instrument/cover_instrument_mcdc.cpp

@@ -11,6 +11,8 @@ Author: Daniel Kroening
 
 #include "cover_instrument.h"
 
+#include <langapi/language_util.h>
+
 #include <algorithm>
 
 #include "cover_util.h"

src/goto-instrument/cover_instrument_other.cpp

@@ -11,6 +11,8 @@ Author: Daniel Kroening
 
 #include "cover_instrument.h"
 
+#include <langapi/language_util.h>
+
 #include "cover_util.h"
 
 void cover_path_instrumentert::instrument(

src/goto-instrument/dot.cpp

@@ -15,6 +15,8 @@ Author: Daniel Kroening, [email protected]
 #include <fstream>
 #include <sstream>
 
+#include <langapi/language_util.h>
+
 #define DOTGRAPHSETTINGS  "color=black;" \
                           "orientation=portrait;" \
                           "fontsize=20;"\

src/goto-instrument/wmm/goto2graph.cpp

@@ -1301,7 +1301,7 @@ bool instrumentert::is_cfg_spurious(const event_grapht::critical_cyclet &cyc)
 
   /* now test whether this part of the code can exist */
   goto_functionst::function_mapt map;
-  goto_function_templatet<goto_programt> one_interleaving;
+  goto_functiont one_interleaving;
   one_interleaving.body.copy_from(interleaving);
   map.insert(std::make_pair(
     goto_functionst::entry_point(),

src/goto-programs/builtin_functions.cpp

@@ -13,6 +13,7 @@ Author: Daniel Kroening, [email protected]
 
 #include <cassert>
 
+#include <util/c_types.h>
 #include <util/rational.h>
 #include <util/replace_expr.h>
 #include <util/rational_tools.h>
@@ -29,9 +30,10 @@ Author: Daniel Kroening, [email protected]
 
 #include <linking/zero_initializer.h>
 
-#include <util/c_types.h>
 #include <ansi-c/string_constant.h>
 
+#include <langapi/language_util.h>
+
 #include "format_strings.h"
 #include "class_identifier.h"
 

src/goto-programs/goto_functions.cpp

@@ -13,8 +13,70 @@ Date: June 2003
 
 #include "goto_functions.h"
 
+void goto_functionst::output(
+  const namespacet &ns,
+  std::ostream &out) const
+{
+  for(const auto &fun : function_map)
+  {
+    if(fun.second.body_available())
+    {
+      out << "^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n\n";
+
+      const symbolt &symbol=ns.lookup(fun.first);
+      out << symbol.display_name() << " /* " << symbol.name << " */\n";
+      fun.second.body.output(ns, symbol.name, out);
+
+      out << std::flush;
+    }
+  }
+}
+
+void goto_functionst::compute_location_numbers()
+{
+  unused_location_number = 0;
+  for(auto &func : function_map)
+  {
+    // Side-effect: bumps unused_location_number.
+    func.second.body.compute_location_numbers(unused_location_number);
+  }
+}
+
+void goto_functionst::compute_location_numbers(
+  goto_programt &program)
+{
+  // Renumber just this single function. Use fresh numbers in case it has
+  // grown since it was last numbered.
+  program.compute_location_numbers(unused_location_number);
+}
+
+void goto_functionst::compute_incoming_edges()
+{
+  for(auto &func : function_map)
+  {
+    func.second.body.compute_incoming_edges();
+  }
+}
+
+void goto_functionst::compute_target_numbers()
+{
+  for(auto &func : function_map)
+  {
+    func.second.body.compute_target_numbers();
+  }
+}
+
+void goto_functionst::compute_loop_numbers()
+{
+  for(auto &func : function_map)
+  {
+    func.second.body.compute_loop_numbers();
+  }
+}
+
+
 void get_local_identifiers(
-  const goto_function_templatet<goto_programt> &goto_function,
+  const goto_functiont &goto_function,
   std::set<irep_idt> &dest)
 {
   goto_function.body.get_decl_identifiers(dest);