Fix include order in util

Author: reuk

src/util/arith_tools.cpp

@@ -6,6 +6,7 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
+#include "arith_tools.h"
 
 #include <cassert>
 
@@ -14,8 +15,6 @@ Author: Daniel Kroening, [email protected]
 #include "std_types.h"
 #include "std_expr.h"
 
-#include "arith_tools.h"
-
 bool to_integer(const exprt &expr, mp_integer &int_value)
 {
   if(!expr.is_constant())

src/util/array_name.cpp

@@ -10,6 +10,7 @@ Author: Daniel Kroening, [email protected]
 /// Misc Utilities
 
 #include "array_name.h"
+
 #include "expr.h"
 #include "namespace.h"
 #include "symbol.h"

src/util/base_type.cpp

@@ -9,11 +9,12 @@ Author: Daniel Kroening, [email protected]
 /// \file
 /// Base Type Computation
 
+#include "base_type.h"
+
 #include <cassert>
 #include <set>
 
 #include "std_types.h"
-#include "base_type.h"
 #include "namespace.h"
 #include "symbol.h"
 

src/util/bv_arithmetic.cpp

@@ -6,6 +6,7 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
+#include "bv_arithmetic.h"
 
 #include <cassert>
 #include <ostream>
@@ -14,7 +15,6 @@ Author: Daniel Kroening, [email protected]
 #include "arith_tools.h"
 #include "std_types.h"
 #include "std_expr.h"
-#include "bv_arithmetic.h"
 
 typet bv_spect::to_type() const
 {

src/util/byte_operators.cpp

@@ -6,10 +6,10 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
+#include "byte_operators.h"
 
 #include <cassert>
 
-#include "byte_operators.h"
 #include "config.h"
 
 irep_idt byte_extract_id()

src/util/cmdline.cpp

@@ -6,13 +6,12 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
+#include "cmdline.h"
 
 #include <cassert>
 #include <cstdlib>
 #include <iostream>
 
-#include "cmdline.h"
-
 cmdlinet::cmdlinet()
 {
 }

src/util/config.cpp

@@ -6,11 +6,11 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
+#include "config.h"
 
 #include <cstdlib>
 
 #include "namespace.h"
-#include "config.h"
 #include "symbol_table.h"
 #include "arith_tools.h"
 #include "cmdline.h"

src/util/cout_message.cpp

@@ -6,6 +6,7 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
+#include "cout_message.h"
 
 #include <iostream>
 
@@ -17,7 +18,6 @@ Author: Daniel Kroening, [email protected]
 #endif
 
 #include "unicode.h"
-#include "cout_message.h"
 
 cout_message_handlert::cout_message_handlert():
   stream_message_handlert(std::cout)

src/util/decision_procedure.cpp

@@ -9,10 +9,10 @@ Author: Daniel Kroening, [email protected]
 /// \file
 /// Decision Procedure Interface
 
-#include <cassert>
-
 #include "decision_procedure.h"
 
+#include <cassert>
+
 bool decision_proceduret::in_core(const exprt &expr)
 {
   assert(false);

src/util/endianness_map.cpp

@@ -6,14 +6,14 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
+#include "endianness_map.h"
 
 #include <ostream>
 #include <cassert>
 
 #include "std_types.h"
 #include "pointer_offset_size.h"
 #include "arith_tools.h"
-#include "endianness_map.h"
 #include "namespace.h"
 
 void endianness_mapt::output(std::ostream &out) const

src/util/expr.cpp

@@ -9,14 +9,17 @@ Author: Daniel Kroening, [email protected]
 /// \file
 /// Expression Representation
 
+#include "expr.h"
+
+#include <cassert>
+
 #include <stack>
 
 #include "string2int.h"
 #include "mp_arith.h"
 #include "fixedbv.h"
 #include "ieee_float.h"
 #include "invariant.h"
-#include "expr.h"
 #include "rational.h"
 #include "rational_tools.h"
 #include "arith_tools.h"

src/util/expr_util.cpp

@@ -8,6 +8,7 @@ Author: Daniel Kroening, [email protected]
 
 
 #include "expr_util.h"
+
 #include "expr.h"
 #include "fixedbv.h"
 #include "ieee_float.h"

src/util/file_util.cpp

@@ -11,6 +11,8 @@ Date: January 2012
 /// \file
 /// File Utilities
 
+#include "file_util.h"
+
 #include <cerrno>
 
 #if defined(__linux__) || \
@@ -38,8 +40,6 @@ Date: January 2012
 #include <cstring>
 #endif
 
-#include "file_util.h"
-
 /// \return current working directory
 std::string get_current_working_directory()
 {

src/util/find_macros.cpp

@@ -6,10 +6,10 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
+#include "find_macros.h"
 
 #include <stack>
 
-#include "find_macros.h"
 #include "expr.h"
 #include "namespace.h"
 #include "symbol.h"

src/util/find_symbols.cpp

@@ -6,12 +6,11 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
+#include "find_symbols.h"
 
 #include "std_types.h"
 #include "std_expr.h"
 
-#include "find_symbols.h"
-
 enum class kindt { F_TYPE, F_TYPE_NON_PTR, F_EXPR, F_BOTH };
 
 void find_symbols(

src/util/fixedbv.cpp

@@ -6,10 +6,10 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
+#include "fixedbv.h"
 
 #include "std_types.h"
 #include "std_expr.h"
-#include "fixedbv.h"
 #include "arith_tools.h"
 
 fixedbv_spect::fixedbv_spect(const fixedbv_typet &type)

src/util/format_constant.cpp

@@ -8,6 +8,7 @@ Author: Daniel Kroening, [email protected]
 
 
 #include "format_constant.h"
+
 #include "arith_tools.h"
 #include "fixedbv.h"
 #include "ieee_float.h"

src/util/get_module.cpp

@@ -9,10 +9,11 @@ Author: Daniel Kroening, [email protected]
 /// \file
 /// Find module symbol using name
 
+#include "get_module.h"
+
 #include <list>
 #include <set>
 
-#include "get_module.h"
 #include "message.h"
 #include "symbol_table.h"
 

src/util/guard.cpp

@@ -9,11 +9,12 @@ Author: Daniel Kroening, [email protected]
 /// \file
 /// Symbolic Execution
 
+#include "guard.h"
+
 #include <ostream>
 
 #include "std_expr.h"
 #include "simplify_utils.h"
-#include "guard.h"
 
 void guardt::guard_expr(exprt &dest) const
 {

src/util/identifier.cpp

@@ -6,11 +6,10 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
+#include "identifier.h"
 
 #include <cstring>
 
-#include "identifier.h"
-
 std::string identifiert::as_string() const
 {
   std::string result;

src/util/ieee_float.cpp

@@ -6,6 +6,7 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
+#include "ieee_float.h"
 
 // <cstdint> is yet to come
 #include <stdint.h>
@@ -18,7 +19,6 @@ Author: Daniel Kroening, [email protected]
 #include "arith_tools.h"
 #include "std_types.h"
 #include "std_expr.h"
-#include "ieee_float.h"
 
 mp_integer ieee_float_spect::bias() const
 {

src/util/irep.cpp

@@ -9,12 +9,12 @@ Author: Daniel Kroening, [email protected]
 /// \file
 /// Internal Representation
 
+#include "irep.h"
+
 #include <ostream>
 
 #include "invariant.h"
-
 #include "string2int.h"
-#include "irep.h"
 #include "string_hash.h"
 #include "irep_hash.h"
 

src/util/irep_hash_container.cpp

@@ -10,6 +10,7 @@ Author: Daniel Kroening, [email protected]
 /// Hashing IREPs
 
 #include "irep_hash_container.h"
+
 #include "irep.h"
 #include "irep_hash.h"
 

src/util/irep_ids.cpp

@@ -9,9 +9,10 @@ Author: Daniel Kroening, [email protected]
 /// \file
 /// Internal Representation
 
+#include "irep_ids.h"
+
 #include <cassert>
 
-#include "irep_ids.h"
 #include "string_container.h"
 
 const char *irep_ids_table[]=

src/util/irep_serialization.cpp

@@ -11,10 +11,11 @@ Date: May 2007
 /// \file
 /// binary irep conversions with hashing
 
+#include "irep_serialization.h"
+
 #include <sstream>
 #include <iostream>
 
-#include "irep_serialization.h"
 #include "string_hash.h"
 
 void irep_serializationt::write_irep(

src/util/json.cpp

@@ -6,11 +6,10 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
+#include "json.h"
 
 #include <ostream>
 
-#include "json.h"
-
 const jsont jsont::null_json_object(jsont::kindt::J_NULL);
 
 void jsont::escape_string(const std::string &src, std::ostream &out)

src/util/json_expr.cpp

@@ -9,6 +9,8 @@ Author: Peter Schrammel
 /// \file
 /// Expressions in JSON
 
+#include "json_expr.h"
+
 #include "namespace.h"
 #include "expr.h"
 #include "json.h"
@@ -18,8 +20,6 @@ Author: Peter Schrammel
 #include "std_expr.h"
 #include "config.h"
 
-#include "json_expr.h"
-
 json_objectt json(const source_locationt &location)
 {
   json_objectt result;

src/util/json_irep.cpp

@@ -9,9 +9,10 @@ Author: Thomas Kiley, [email protected]
 /// \file
 /// Util
 
+#include "json_irep.h"
+
 #include "irep.h"
 #include "json.h"
-#include "json_irep.h"
 
 #include <algorithm>
 

src/util/language.cpp

@@ -10,6 +10,7 @@ Author: Daniel Kroening, [email protected]
 /// Abstract interface to support a programming language
 
 #include "language.h"
+
 #include "expr.h"
 
 bool languaget::final(symbol_tablet &symbol_table)

src/util/language_file.cpp

@@ -6,11 +6,11 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
+#include "language_file.h"
 
 #include <fstream>
 
 #include "language.h"
-#include "language_file.h"
 
 language_filet::language_filet(const language_filet &rhs):
   modules(rhs.modules),