Fix include order in util

diffblue · May 22, 2017 · 242d224 · 242d224
1 parent 07ee2fb
commit 242d224
Show file tree

Hide file tree

Showing 80 changed files with 152 additions and 103 deletions.
diff --git a/src/util/arith_tools.cpp b/src/util/arith_tools.cpp
@@ -6,15 +6,15 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
+#include "arith_tools.h"
+
 #include <cassert>
 
 #include "fixedbv.h"
 #include "ieee_float.h"
 #include "std_types.h"
 #include "std_expr.h"
 
-#include "arith_tools.h"
-
 /*******************************************************************\
 
 Function: to_integer

diff --git a/src/util/array_name.cpp b/src/util/array_name.cpp
@@ -7,6 +7,7 @@ Author: Daniel Kroening, [email protected]
 \*******************************************************************/
 
 #include "array_name.h"
+
 #include "expr.h"
 #include "namespace.h"
 #include "symbol.h"

diff --git a/src/util/base_type.cpp b/src/util/base_type.cpp
@@ -6,11 +6,12 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
+#include "base_type.h"
+
 #include <cassert>
 #include <set>
 
 #include "std_types.h"
-#include "base_type.h"
 #include "namespace.h"
 #include "symbol.h"
 

diff --git a/src/util/bv_arithmetic.cpp b/src/util/bv_arithmetic.cpp
@@ -6,14 +6,15 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
+#include "bv_arithmetic.h"
+
 #include <cassert>
 #include <ostream>
 
 #include "string2int.h"
 #include "arith_tools.h"
 #include "std_types.h"
 #include "std_expr.h"
-#include "bv_arithmetic.h"
 
 /*******************************************************************\
 

diff --git a/src/util/byte_operators.cpp b/src/util/byte_operators.cpp
@@ -6,9 +6,10 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
+#include "byte_operators.h"
+
 #include <cassert>
 
-#include "byte_operators.h"
 #include "config.h"
 
 /*******************************************************************\

diff --git a/src/util/cmdline.cpp b/src/util/cmdline.cpp
@@ -6,12 +6,12 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
+#include "cmdline.h"
+
 #include <cassert>
 #include <cstdlib>
 #include <iostream>
 
-#include "cmdline.h"
-
 /*******************************************************************\
 
 Function: cmdlinet::cmdlinet

diff --git a/src/util/config.cpp b/src/util/config.cpp
@@ -6,10 +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"

diff --git a/src/util/cout_message.cpp b/src/util/cout_message.cpp
@@ -6,6 +6,8 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
+#include "cout_message.h"
+
 #include <iostream>
 
 #ifdef _WIN32
@@ -16,7 +18,6 @@ Author: Daniel Kroening, [email protected]
 #endif
 
 #include "unicode.h"
-#include "cout_message.h"
 
 /*******************************************************************\
 

diff --git a/src/util/decision_procedure.cpp b/src/util/decision_procedure.cpp
@@ -6,10 +6,10 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
-#include <cassert>
-
 #include "decision_procedure.h"
 
+#include <cassert>
+
 /*******************************************************************\
 
 Function: decision_proceduret::in_core

diff --git a/src/util/endianness_map.cpp b/src/util/endianness_map.cpp
@@ -6,13 +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"
 
 /*******************************************************************\

diff --git a/src/util/expr.cpp b/src/util/expr.cpp
@@ -6,6 +6,8 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
+#include "expr.h"
+
 #include <cassert>
 
 #include <stack>
@@ -14,7 +16,6 @@ Author: Daniel Kroening, [email protected]
 #include "mp_arith.h"
 #include "fixedbv.h"
 #include "ieee_float.h"
-#include "expr.h"
 #include "rational.h"
 #include "rational_tools.h"
 #include "arith_tools.h"

diff --git a/src/util/expr_util.cpp b/src/util/expr_util.cpp
@@ -7,6 +7,7 @@ Author: Daniel Kroening, [email protected]
 \*******************************************************************/
 
 #include "expr_util.h"
+
 #include "expr.h"
 #include "fixedbv.h"
 #include "ieee_float.h"

diff --git a/src/util/file_util.cpp b/src/util/file_util.cpp
@@ -8,6 +8,8 @@ Date: January 2012
 
 \*******************************************************************/
 
+#include "file_util.h"
+
 #include <cerrno>
 
 #if defined(__linux__) || \
@@ -35,8 +37,6 @@ Date: January 2012
 #include <cstring>
 #endif
 
-#include "file_util.h"
-
 /*******************************************************************\
 
 Function: get_current_working_directory

diff --git a/src/util/find_macros.cpp b/src/util/find_macros.cpp
@@ -6,9 +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"

diff --git a/src/util/find_symbols.cpp b/src/util/find_symbols.cpp
@@ -6,11 +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 };
 
 /*******************************************************************\

diff --git a/src/util/fixedbv.cpp b/src/util/fixedbv.cpp
@@ -6,9 +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"
 
 /*******************************************************************\

diff --git a/src/util/format_constant.cpp b/src/util/format_constant.cpp
@@ -7,6 +7,7 @@ Author: Daniel Kroening, [email protected]
 \*******************************************************************/
 
 #include "format_constant.h"
+
 #include "arith_tools.h"
 #include "fixedbv.h"
 #include "ieee_float.h"

diff --git a/src/util/get_module.cpp b/src/util/get_module.cpp
@@ -6,10 +6,11 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
+#include "get_module.h"
+
 #include <list>
 #include <set>
 
-#include "get_module.h"
 #include "message.h"
 #include "symbol_table.h"
 

diff --git a/src/util/guard.cpp b/src/util/guard.cpp
@@ -6,11 +6,12 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
+#include "guard.h"
+
 #include <ostream>
 
 #include "std_expr.h"
 #include "simplify_utils.h"
-#include "guard.h"
 
 /*******************************************************************\
 

diff --git a/src/util/identifier.cpp b/src/util/identifier.cpp
@@ -6,10 +6,10 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
-#include <cstring>
-
 #include "identifier.h"
 
+#include <cstring>
+
 /*******************************************************************\
 
 Function: identifiert::as_string

diff --git a/src/util/ieee_float.cpp b/src/util/ieee_float.cpp
@@ -6,6 +6,8 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
+#include "ieee_float.h"
+
 // <cstdint> is yet to come
 #include <stdint.h>
 
@@ -17,7 +19,6 @@ Author: Daniel Kroening, [email protected]
 #include "arith_tools.h"
 #include "std_types.h"
 #include "std_expr.h"
-#include "ieee_float.h"
 
 /*******************************************************************\
 

diff --git a/src/util/irep.cpp b/src/util/irep.cpp
@@ -6,11 +6,12 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
+#include "irep.h"
+
 #include <cassert>
 #include <ostream>
 
 #include "string2int.h"
-#include "irep.h"
 #include "string_hash.h"
 #include "irep_hash.h"
 

diff --git a/src/util/irep_hash_container.cpp b/src/util/irep_hash_container.cpp
@@ -7,6 +7,7 @@ Author: Daniel Kroening, [email protected]
 \*******************************************************************/
 
 #include "irep_hash_container.h"
+
 #include "irep.h"
 #include "irep_hash.h"
 

diff --git a/src/util/irep_ids.cpp b/src/util/irep_ids.cpp
@@ -6,9 +6,10 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
+#include "irep_ids.h"
+
 #include <cassert>
 
-#include "irep_ids.h"
 #include "string_container.h"
 
 const char *irep_ids_table[]=

diff --git a/src/util/irep_serialization.cpp b/src/util/irep_serialization.cpp
@@ -8,10 +8,11 @@ Date: May 2007
 
 \*******************************************************************/
 
+#include "irep_serialization.h"
+
 #include <sstream>
 #include <iostream>
 
-#include "irep_serialization.h"
 #include "string_hash.h"
 
 /*******************************************************************\

diff --git a/src/util/json.cpp b/src/util/json.cpp
@@ -6,10 +6,10 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
-#include <ostream>
-
 #include "json.h"
 
+#include <ostream>
+
 const jsont jsont::null_json_object(jsont::kindt::J_NULL);
 
 /*******************************************************************\

diff --git a/src/util/json_expr.cpp b/src/util/json_expr.cpp
@@ -6,6 +6,8 @@ Author: Peter Schrammel
 
 \*******************************************************************/
 
+#include "json_expr.h"
+
 #include "namespace.h"
 #include "expr.h"
 #include "json.h"
@@ -15,8 +17,6 @@ Author: Peter Schrammel
 #include "std_expr.h"
 #include "config.h"
 
-#include "json_expr.h"
-
 /*******************************************************************\
 
 Function: json

diff --git a/src/util/json_irep.cpp b/src/util/json_irep.cpp
@@ -6,9 +6,10 @@ Author: Thomas Kiley, [email protected]
 
 \*******************************************************************/
 
+#include "json_irep.h"
+
 #include "irep.h"
 #include "json.h"
-#include "json_irep.h"
 
 #include <algorithm>
 

diff --git a/src/util/language.cpp b/src/util/language.cpp
@@ -7,6 +7,7 @@ Author: Daniel Kroening, [email protected]
 \*******************************************************************/
 
 #include "language.h"
+
 #include "expr.h"
 
 /*******************************************************************\

diff --git a/src/util/language_file.cpp b/src/util/language_file.cpp
@@ -6,10 +6,11 @@ Author: Daniel Kroening, [email protected]
 
 \*******************************************************************/
 
+#include "language_file.h"
+
 #include <fstream>
 
 #include "language.h"
-#include "language_file.h"
 
 /*******************************************************************\