Merge pull request #1835 from diffblue/remove-goto-templates

expand goto_programt and goto_functionst templates

Author: Daniel Kroening

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, kroening@kroening.com
 #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, kroening@kroening.com
 #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, kroening@kroening.com
 
 #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, kroening@kroening.com
 #include "bmc.h"
 
 #include <chrono>
+#include <iomanip>
 
 #include <util/xml.h>
 #include <util/xml_expr.h>
@@ -25,6 +26,8 @@ Author: Daniel Kroening, kroening@kroening.com
 #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(