From 242d224162bbd054b3fa52680509933d136b9788 Mon Sep 17 00:00:00 2001 From: reuk Date: Sun, 7 May 2017 14:47:30 +0100 Subject: [PATCH] Fix include order in util --- src/util/arith_tools.cpp | 4 ++-- src/util/array_name.cpp | 1 + src/util/base_type.cpp | 3 ++- src/util/bv_arithmetic.cpp | 3 ++- src/util/byte_operators.cpp | 3 ++- src/util/cmdline.cpp | 4 ++-- src/util/config.cpp | 3 ++- src/util/cout_message.cpp | 3 ++- src/util/decision_procedure.cpp | 4 ++-- src/util/endianness_map.cpp | 3 ++- src/util/expr.cpp | 3 ++- src/util/expr_util.cpp | 1 + src/util/file_util.cpp | 4 ++-- src/util/find_macros.cpp | 3 ++- src/util/find_symbols.cpp | 4 ++-- src/util/fixedbv.cpp | 3 ++- src/util/format_constant.cpp | 1 + src/util/get_module.cpp | 3 ++- src/util/guard.cpp | 3 ++- src/util/identifier.cpp | 4 ++-- src/util/ieee_float.cpp | 3 ++- src/util/irep.cpp | 3 ++- src/util/irep_hash_container.cpp | 1 + src/util/irep_ids.cpp | 3 ++- src/util/irep_serialization.cpp | 3 ++- src/util/json.cpp | 4 ++-- src/util/json_expr.cpp | 4 ++-- src/util/json_irep.cpp | 3 ++- src/util/language.cpp | 1 + src/util/language_file.cpp | 3 ++- src/util/lispexpr.cpp | 4 ++-- src/util/lispirep.cpp | 1 + src/util/memory_info.cpp | 4 ++-- src/util/merge_irep.cpp | 3 ++- src/util/mp_arith.cpp | 3 ++- src/util/namespace.cpp | 3 ++- src/util/options.cpp | 3 ++- src/util/parse_options.cpp | 3 ++- src/util/pipe_stream.cpp | 3 ++- src/util/pipe_stream.h | 2 +- src/util/pointer_offset_size.cpp | 4 ++-- src/util/pointer_predicates.cpp | 4 ++-- src/util/rational.cpp | 4 ++-- src/util/rational_tools.cpp | 4 ++-- src/util/rename.cpp | 3 ++- src/util/rename_symbol.cpp | 3 ++- src/util/replace_symbol.cpp | 3 ++- src/util/run.cpp | 4 ++-- src/util/signal_catcher.cpp | 4 ++-- src/util/simplify_expr.cpp | 3 ++- src/util/simplify_expr_array.cpp | 3 ++- src/util/simplify_expr_boolean.cpp | 3 ++- src/util/simplify_expr_floatbv.cpp | 3 ++- src/util/simplify_expr_int.cpp | 3 ++- src/util/simplify_expr_pointer.cpp | 3 ++- src/util/simplify_expr_struct.cpp | 3 ++- src/util/simplify_utils.cpp | 4 ++-- src/util/source_location.cpp | 3 ++- src/util/ssa_expr.cpp | 4 ++-- src/util/std_code.cpp | 1 + src/util/std_expr.cpp | 3 ++- src/util/std_types.cpp | 3 ++- src/util/string2int.cpp | 4 ++-- src/util/string_container.cpp | 4 ++-- src/util/string_utils.cpp | 4 ++-- src/util/substitute.cpp | 4 ++-- src/util/symbol.cpp | 3 ++- src/util/symbol_table.cpp | 4 ++-- src/util/tempdir.cpp | 3 ++- src/util/tempfile.cpp | 4 ++-- src/util/threeval.cpp | 4 ++-- src/util/time_stopping.cpp | 4 ++-- src/util/timer.cpp | 4 ++-- src/util/type_eq.cpp | 3 ++- src/util/ui_message.cpp | 3 ++- src/util/unicode.cpp | 4 ++-- src/util/union_find.cpp | 4 ++-- src/util/xml.cpp | 3 ++- src/util/xml_expr.cpp | 4 ++-- src/util/xml_irep.cpp | 3 ++- 80 files changed, 152 insertions(+), 103 deletions(-) diff --git a/src/util/arith_tools.cpp b/src/util/arith_tools.cpp index 37e96ec8ef8..301b1ecb46c 100644 --- a/src/util/arith_tools.cpp +++ b/src/util/arith_tools.cpp @@ -6,6 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#include "arith_tools.h" + #include #include "fixedbv.h" @@ -13,8 +15,6 @@ Author: Daniel Kroening, kroening@kroening.com #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 index d29d60f77fc..77d66426fb0 100644 --- a/src/util/array_name.cpp +++ b/src/util/array_name.cpp @@ -7,6 +7,7 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ #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 index 7be2883ff99..bc223d03084 100644 --- a/src/util/base_type.cpp +++ b/src/util/base_type.cpp @@ -6,11 +6,12 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#include "base_type.h" + #include #include #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 index 4e077ad0a1e..4a672f9daab 100644 --- a/src/util/bv_arithmetic.cpp +++ b/src/util/bv_arithmetic.cpp @@ -6,6 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#include "bv_arithmetic.h" + #include #include @@ -13,7 +15,6 @@ Author: Daniel Kroening, kroening@kroening.com #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 index 46e7d3f218e..89420c4df75 100644 --- a/src/util/byte_operators.cpp +++ b/src/util/byte_operators.cpp @@ -6,9 +6,10 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#include "byte_operators.h" + #include -#include "byte_operators.h" #include "config.h" /*******************************************************************\ diff --git a/src/util/cmdline.cpp b/src/util/cmdline.cpp index cbfb033cbdd..b4f8a61410d 100644 --- a/src/util/cmdline.cpp +++ b/src/util/cmdline.cpp @@ -6,12 +6,12 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#include "cmdline.h" + #include #include #include -#include "cmdline.h" - /*******************************************************************\ Function: cmdlinet::cmdlinet diff --git a/src/util/config.cpp b/src/util/config.cpp index 8751a35b711..2660a84336b 100644 --- a/src/util/config.cpp +++ b/src/util/config.cpp @@ -6,10 +6,11 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#include "config.h" + #include #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 index 393ec62432f..7dd515ba8ad 100644 --- a/src/util/cout_message.cpp +++ b/src/util/cout_message.cpp @@ -6,6 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#include "cout_message.h" + #include #ifdef _WIN32 @@ -16,7 +18,6 @@ Author: Daniel Kroening, kroening@kroening.com #endif #include "unicode.h" -#include "cout_message.h" /*******************************************************************\ diff --git a/src/util/decision_procedure.cpp b/src/util/decision_procedure.cpp index 6800b0148d6..4c8ba36957a 100644 --- a/src/util/decision_procedure.cpp +++ b/src/util/decision_procedure.cpp @@ -6,10 +6,10 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#include - #include "decision_procedure.h" +#include + /*******************************************************************\ Function: decision_proceduret::in_core diff --git a/src/util/endianness_map.cpp b/src/util/endianness_map.cpp index d030df0c75e..4a3a1de8106 100644 --- a/src/util/endianness_map.cpp +++ b/src/util/endianness_map.cpp @@ -6,13 +6,14 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#include "endianness_map.h" + #include #include #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 index 3b480e4bfe2..e122d3c3e12 100644 --- a/src/util/expr.cpp +++ b/src/util/expr.cpp @@ -6,6 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#include "expr.h" + #include #include @@ -14,7 +16,6 @@ Author: Daniel Kroening, kroening@kroening.com #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 index d5a28e4f5fa..36807cb80fb 100644 --- a/src/util/expr_util.cpp +++ b/src/util/expr_util.cpp @@ -7,6 +7,7 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ #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 index 18634240141..87944110af8 100644 --- a/src/util/file_util.cpp +++ b/src/util/file_util.cpp @@ -8,6 +8,8 @@ Date: January 2012 \*******************************************************************/ +#include "file_util.h" + #include #if defined(__linux__) || \ @@ -35,8 +37,6 @@ Date: January 2012 #include #endif -#include "file_util.h" - /*******************************************************************\ Function: get_current_working_directory diff --git a/src/util/find_macros.cpp b/src/util/find_macros.cpp index 8e2e249ada6..1ddc7f33b63 100644 --- a/src/util/find_macros.cpp +++ b/src/util/find_macros.cpp @@ -6,9 +6,10 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#include "find_macros.h" + #include -#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 index b62ea77b368..02ea7958efa 100644 --- a/src/util/find_symbols.cpp +++ b/src/util/find_symbols.cpp @@ -6,11 +6,11 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#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 index d1703d85ca9..70094a12b7d 100644 --- a/src/util/fixedbv.cpp +++ b/src/util/fixedbv.cpp @@ -6,9 +6,10 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#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 index a63b1d01555..1883734388d 100644 --- a/src/util/format_constant.cpp +++ b/src/util/format_constant.cpp @@ -7,6 +7,7 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ #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 index e4afd21400f..b1029aaa7a5 100644 --- a/src/util/get_module.cpp +++ b/src/util/get_module.cpp @@ -6,10 +6,11 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#include "get_module.h" + #include #include -#include "get_module.h" #include "message.h" #include "symbol_table.h" diff --git a/src/util/guard.cpp b/src/util/guard.cpp index a247f8b5f86..cba69471b81 100644 --- a/src/util/guard.cpp +++ b/src/util/guard.cpp @@ -6,11 +6,12 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#include "guard.h" + #include #include "std_expr.h" #include "simplify_utils.h" -#include "guard.h" /*******************************************************************\ diff --git a/src/util/identifier.cpp b/src/util/identifier.cpp index 96074d9c43e..f1c98d01e01 100644 --- a/src/util/identifier.cpp +++ b/src/util/identifier.cpp @@ -6,10 +6,10 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#include - #include "identifier.h" +#include + /*******************************************************************\ Function: identifiert::as_string diff --git a/src/util/ieee_float.cpp b/src/util/ieee_float.cpp index 73290f70654..2cd33277fb4 100644 --- a/src/util/ieee_float.cpp +++ b/src/util/ieee_float.cpp @@ -6,6 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#include "ieee_float.h" + // is yet to come #include @@ -17,7 +19,6 @@ Author: Daniel Kroening, kroening@kroening.com #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 index 44cc123b0fd..b8612c5fc13 100644 --- a/src/util/irep.cpp +++ b/src/util/irep.cpp @@ -6,11 +6,12 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#include "irep.h" + #include #include #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 index 5d17b3d3f9f..d6eab5a3ca1 100644 --- a/src/util/irep_hash_container.cpp +++ b/src/util/irep_hash_container.cpp @@ -7,6 +7,7 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ #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 index bb67b275f0a..eafbb39f985 100644 --- a/src/util/irep_ids.cpp +++ b/src/util/irep_ids.cpp @@ -6,9 +6,10 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#include "irep_ids.h" + #include -#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 index 1f15552421e..9dfa181593f 100644 --- a/src/util/irep_serialization.cpp +++ b/src/util/irep_serialization.cpp @@ -8,10 +8,11 @@ Date: May 2007 \*******************************************************************/ +#include "irep_serialization.h" + #include #include -#include "irep_serialization.h" #include "string_hash.h" /*******************************************************************\ diff --git a/src/util/json.cpp b/src/util/json.cpp index 39769a8c5c2..8de04a49a5d 100644 --- a/src/util/json.cpp +++ b/src/util/json.cpp @@ -6,10 +6,10 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#include - #include "json.h" +#include + const jsont jsont::null_json_object(jsont::kindt::J_NULL); /*******************************************************************\ diff --git a/src/util/json_expr.cpp b/src/util/json_expr.cpp index 77f58eb0e18..4ca3b14a640 100644 --- 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 index 2740228d1db..03cb03b9d2e 100644 --- a/src/util/json_irep.cpp +++ b/src/util/json_irep.cpp @@ -6,9 +6,10 @@ Author: Thomas Kiley, thomas.kiley@diffblue.com \*******************************************************************/ +#include "json_irep.h" + #include "irep.h" #include "json.h" -#include "json_irep.h" #include diff --git a/src/util/language.cpp b/src/util/language.cpp index 4b4a1ba4ae4..b61791f4b63 100644 --- a/src/util/language.cpp +++ b/src/util/language.cpp @@ -7,6 +7,7 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ #include "language.h" + #include "expr.h" /*******************************************************************\ diff --git a/src/util/language_file.cpp b/src/util/language_file.cpp index 46f51564b54..a22c6b88932 100644 --- a/src/util/language_file.cpp +++ b/src/util/language_file.cpp @@ -6,10 +6,11 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#include "language_file.h" + #include #include "language.h" -#include "language_file.h" /*******************************************************************\ diff --git a/src/util/lispexpr.cpp b/src/util/lispexpr.cpp index 7b19fe5db37..3a08a6bc76c 100644 --- a/src/util/lispexpr.cpp +++ b/src/util/lispexpr.cpp @@ -6,10 +6,10 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#include - #include "lispexpr.h" +#include + /*******************************************************************\ Function: lispexprt::expr2string diff --git a/src/util/lispirep.cpp b/src/util/lispirep.cpp index 75e926e8107..7ec49b43073 100644 --- a/src/util/lispirep.cpp +++ b/src/util/lispirep.cpp @@ -7,6 +7,7 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ #include "lispirep.h" + #include "irep.h" #include "lispexpr.h" diff --git a/src/util/memory_info.cpp b/src/util/memory_info.cpp index af4f2ef1d52..4f04fcad0af 100644 --- a/src/util/memory_info.cpp +++ b/src/util/memory_info.cpp @@ -6,6 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#include "memory_info.h" + #ifdef __APPLE__ #include #include @@ -23,8 +25,6 @@ Author: Daniel Kroening, kroening@kroening.com #include -#include "memory_info.h" - /*******************************************************************\ Function: memory_info diff --git a/src/util/merge_irep.cpp b/src/util/merge_irep.cpp index 6b8d4a6924a..32dea88f90f 100644 --- a/src/util/merge_irep.cpp +++ b/src/util/merge_irep.cpp @@ -6,9 +6,10 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#include "irep_hash.h" #include "merge_irep.h" +#include "irep_hash.h" + /*******************************************************************\ Function: to_be_merged_irept::hash diff --git a/src/util/mp_arith.cpp b/src/util/mp_arith.cpp index 338a6103e40..0ff41370099 100644 --- a/src/util/mp_arith.cpp +++ b/src/util/mp_arith.cpp @@ -6,6 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#include "mp_arith.h" + #include #include #include @@ -14,7 +16,6 @@ Author: Daniel Kroening, kroening@kroening.com #include #include -#include "mp_arith.h" #include "arith_tools.h" /*******************************************************************\ diff --git a/src/util/namespace.cpp b/src/util/namespace.cpp index 1abf0fb1c59..2dc27e29ecd 100644 --- a/src/util/namespace.cpp +++ b/src/util/namespace.cpp @@ -6,6 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#include "namespace.h" + #include #include @@ -14,7 +16,6 @@ Author: Daniel Kroening, kroening@kroening.com #include "symbol_table.h" #include "prefix.h" #include "std_types.h" -#include "namespace.h" /*******************************************************************\ diff --git a/src/util/options.cpp b/src/util/options.cpp index e1cb8a369db..fd94a9378ff 100644 --- a/src/util/options.cpp +++ b/src/util/options.cpp @@ -6,9 +6,10 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#include "string2int.h" #include "options.h" +#include "string2int.h" + /*******************************************************************\ Function: optionst::set_option diff --git a/src/util/parse_options.cpp b/src/util/parse_options.cpp index f674d9717e6..7a096dd7f08 100644 --- a/src/util/parse_options.cpp +++ b/src/util/parse_options.cpp @@ -6,6 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#include "parse_options.h" + #include #if defined (_WIN32) @@ -16,7 +18,6 @@ Author: Daniel Kroening, kroening@kroening.com #endif #include "cmdline.h" -#include "parse_options.h" #include "signal_catcher.h" /*******************************************************************\ diff --git a/src/util/pipe_stream.cpp b/src/util/pipe_stream.cpp index ff57dcd299c..aeef1923b66 100644 --- a/src/util/pipe_stream.cpp +++ b/src/util/pipe_stream.cpp @@ -6,12 +6,13 @@ Module: A stdin/stdout pipe as STL stream \*******************************************************************/ +#include "pipe_stream.h" + #include #include #include #include "unicode.h" -#include "pipe_stream.h" #ifdef _WIN32 #include diff --git a/src/util/pipe_stream.h b/src/util/pipe_stream.h index b2b5bcea533..f8b901055cb 100644 --- a/src/util/pipe_stream.h +++ b/src/util/pipe_stream.h @@ -9,7 +9,7 @@ Module: A stdin/stdout pipe as STL stream #ifndef CPROVER_UTIL_PIPE_STREAM_H #define CPROVER_UTIL_PIPE_STREAM_H -#include +#include #include #include diff --git a/src/util/pointer_offset_size.cpp b/src/util/pointer_offset_size.cpp index 43e7dd0d5a9..21dab28e7e5 100644 --- a/src/util/pointer_offset_size.cpp +++ b/src/util/pointer_offset_size.cpp @@ -6,6 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#include "pointer_offset_size.h" + #include #include "expr.h" @@ -19,8 +21,6 @@ Author: Daniel Kroening, kroening@kroening.com #include "symbol.h" #include "ssa_expr.h" -#include "pointer_offset_size.h" - member_offset_iterator::member_offset_iterator( const struct_typet &_type, const namespacet &_ns): diff --git a/src/util/pointer_predicates.cpp b/src/util/pointer_predicates.cpp index 53427d056e2..e6ba2ad31cb 100644 --- a/src/util/pointer_predicates.cpp +++ b/src/util/pointer_predicates.cpp @@ -6,6 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#include "pointer_predicates.h" + #include "cprover_prefix.h" #include "namespace.h" #include "std_expr.h" @@ -15,8 +17,6 @@ Author: Daniel Kroening, kroening@kroening.com #include "config.h" #include "symbol.h" -#include "pointer_predicates.h" - /*******************************************************************\ Function: pointer_object diff --git a/src/util/rational.cpp b/src/util/rational.cpp index 45dfdec86db..b40a7b8b22f 100644 --- a/src/util/rational.cpp +++ b/src/util/rational.cpp @@ -6,11 +6,11 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#include "rational.h" + #include #include -#include "rational.h" - /*******************************************************************\ Function: rationalt::operator+= diff --git a/src/util/rational_tools.cpp b/src/util/rational_tools.cpp index 3e57beefc91..dbd218a9d17 100644 --- a/src/util/rational_tools.cpp +++ b/src/util/rational_tools.cpp @@ -6,11 +6,11 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#include "rational_tools.h" + #include "rational.h" #include "std_types.h" -#include "rational_tools.h" - /*******************************************************************\ Function: power10 diff --git a/src/util/rename.cpp b/src/util/rename.cpp index b121edb6acb..14caf1626e7 100644 --- a/src/util/rename.cpp +++ b/src/util/rename.cpp @@ -6,9 +6,10 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#include "rename.h" + #include -#include "rename.h" #include "symbol.h" #include "expr.h" #include "namespace.h" diff --git a/src/util/rename_symbol.cpp b/src/util/rename_symbol.cpp index c6930a01d87..a79761dc1e9 100644 --- a/src/util/rename_symbol.cpp +++ b/src/util/rename_symbol.cpp @@ -6,9 +6,10 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#include "rename_symbol.h" + #include "std_types.h" #include "std_expr.h" -#include "rename_symbol.h" /*******************************************************************\ diff --git a/src/util/replace_symbol.cpp b/src/util/replace_symbol.cpp index 4dce48d8b93..a7fe2b2a0c9 100644 --- a/src/util/replace_symbol.cpp +++ b/src/util/replace_symbol.cpp @@ -6,9 +6,10 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#include "replace_symbol.h" + #include "std_types.h" #include "std_expr.h" -#include "replace_symbol.h" /*******************************************************************\ diff --git a/src/util/run.cpp b/src/util/run.cpp index 8a8a1c68659..923ab8cb2a5 100644 --- a/src/util/run.cpp +++ b/src/util/run.cpp @@ -8,6 +8,8 @@ Date: August 2012 \*******************************************************************/ +#include "run.h" + #include #ifdef _WIN32 @@ -31,8 +33,6 @@ Date: August 2012 #include #include -#include "run.h" - /*******************************************************************\ Function: run_shell diff --git a/src/util/signal_catcher.cpp b/src/util/signal_catcher.cpp index b0178340543..af401835e81 100644 --- a/src/util/signal_catcher.cpp +++ b/src/util/signal_catcher.cpp @@ -8,6 +8,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#include "signal_catcher.h" + #if defined(_WIN32) #include #else @@ -17,8 +19,6 @@ Author: Daniel Kroening, kroening@kroening.com #include -#include "signal_catcher.h" - // Here we have an instance of an ugly global object. // It keeps track of any child processes that we'll kill // when we are told to terminate. diff --git a/src/util/simplify_expr.cpp b/src/util/simplify_expr.cpp index 837138258d0..bceaee9d223 100644 --- a/src/util/simplify_expr.cpp +++ b/src/util/simplify_expr.cpp @@ -6,12 +6,13 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#include "simplify_expr.h" + #include #include #include "rational.h" #include "simplify_expr_class.h" -#include "simplify_expr.h" #include "mp_arith.h" #include "arith_tools.h" #include "replace_expr.h" diff --git a/src/util/simplify_expr_array.cpp b/src/util/simplify_expr_array.cpp index f00c039a6ef..ba532804aca 100644 --- a/src/util/simplify_expr_array.cpp +++ b/src/util/simplify_expr_array.cpp @@ -6,9 +6,10 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#include "simplify_expr_class.h" + #include -#include "simplify_expr_class.h" #include "expr.h" #include "namespace.h" #include "std_expr.h" diff --git a/src/util/simplify_expr_boolean.cpp b/src/util/simplify_expr_boolean.cpp index b747047cf98..3d3a2220a96 100644 --- a/src/util/simplify_expr_boolean.cpp +++ b/src/util/simplify_expr_boolean.cpp @@ -6,10 +6,11 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#include "simplify_expr_class.h" + #include #include -#include "simplify_expr_class.h" #include "expr.h" #include "namespace.h" #include "std_expr.h" diff --git a/src/util/simplify_expr_floatbv.cpp b/src/util/simplify_expr_floatbv.cpp index 7115e23024a..9ad745fe640 100644 --- a/src/util/simplify_expr_floatbv.cpp +++ b/src/util/simplify_expr_floatbv.cpp @@ -6,9 +6,10 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#include "simplify_expr_class.h" + #include -#include "simplify_expr_class.h" #include "expr.h" #include "namespace.h" #include "ieee_float.h" diff --git a/src/util/simplify_expr_int.cpp b/src/util/simplify_expr_int.cpp index c9c8a7f12a0..9e592315431 100644 --- a/src/util/simplify_expr_int.cpp +++ b/src/util/simplify_expr_int.cpp @@ -6,11 +6,12 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#include "simplify_expr_class.h" + #include #include "base_type.h" #include "rational.h" -#include "simplify_expr_class.h" #include "expr.h" #include "namespace.h" #include "config.h" diff --git a/src/util/simplify_expr_pointer.cpp b/src/util/simplify_expr_pointer.cpp index 9bc2496f5ff..f57b7b0a51e 100644 --- a/src/util/simplify_expr_pointer.cpp +++ b/src/util/simplify_expr_pointer.cpp @@ -6,9 +6,10 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#include "simplify_expr_class.h" + #include -#include "simplify_expr_class.h" #include "expr.h" #include "namespace.h" #include "std_expr.h" diff --git a/src/util/simplify_expr_struct.cpp b/src/util/simplify_expr_struct.cpp index a59c355e72c..bcb5e98aa0b 100644 --- a/src/util/simplify_expr_struct.cpp +++ b/src/util/simplify_expr_struct.cpp @@ -6,9 +6,10 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#include "simplify_expr_class.h" + #include -#include "simplify_expr_class.h" #include "expr.h" #include "namespace.h" #include "std_expr.h" diff --git a/src/util/simplify_utils.cpp b/src/util/simplify_utils.cpp index ff5abf78930..caa3b4d0769 100644 --- a/src/util/simplify_utils.cpp +++ b/src/util/simplify_utils.cpp @@ -6,10 +6,10 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#include - #include "simplify_utils.h" +#include + /*******************************************************************\ Function: simplify_exprt::sort_operands diff --git a/src/util/source_location.cpp b/src/util/source_location.cpp index 7583b40b496..0010fa0d449 100644 --- a/src/util/source_location.cpp +++ b/src/util/source_location.cpp @@ -6,9 +6,10 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#include "source_location.h" + #include -#include "source_location.h" #include "file_util.h" /*******************************************************************\ diff --git a/src/util/ssa_expr.cpp b/src/util/ssa_expr.cpp index c75d7d2ed92..d80b0b7ac2a 100644 --- a/src/util/ssa_expr.cpp +++ b/src/util/ssa_expr.cpp @@ -6,13 +6,13 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#include "ssa_expr.h" + #include #include #include -#include "ssa_expr.h" - /*******************************************************************\ Function: build_identifier_rec diff --git a/src/util/std_code.cpp b/src/util/std_code.cpp index d7a4f2aa0fd..ef08f35072c 100644 --- a/src/util/std_code.cpp +++ b/src/util/std_code.cpp @@ -7,6 +7,7 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ #include "std_code.h" + #include "std_expr.h" /*******************************************************************\ diff --git a/src/util/std_expr.cpp b/src/util/std_expr.cpp index 4cb9eeff9cc..969d3c9de72 100644 --- a/src/util/std_expr.cpp +++ b/src/util/std_expr.cpp @@ -6,6 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#include "std_expr.h" + #include #include "arith_tools.h" @@ -15,7 +17,6 @@ Author: Daniel Kroening, kroening@kroening.com #include "pointer_offset_size.h" #include "std_types.h" -#include "std_expr.h" /*******************************************************************\ diff --git a/src/util/std_types.cpp b/src/util/std_types.cpp index e6244ab5c9b..ec108ca4321 100644 --- a/src/util/std_types.cpp +++ b/src/util/std_types.cpp @@ -6,9 +6,10 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#include "std_types.h" + #include "string2int.h" #include "arith_tools.h" -#include "std_types.h" #include "std_expr.h" /*******************************************************************\ diff --git a/src/util/string2int.cpp b/src/util/string2int.cpp index 224e5779858..e4619b7d918 100644 --- a/src/util/string2int.cpp +++ b/src/util/string2int.cpp @@ -6,13 +6,13 @@ Author: Michael Tautschnig, michael.tautschnig@cs.ox.ac.uk \*******************************************************************/ +#include "string2int.h" + #include #include #include #include -#include "string2int.h" - /*******************************************************************\ Function: str2number diff --git a/src/util/string_container.cpp b/src/util/string_container.cpp index 1b1603631d0..e10f2518398 100644 --- a/src/util/string_container.cpp +++ b/src/util/string_container.cpp @@ -6,10 +6,10 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#include - #include "string_container.h" +#include + string_containert string_container; /*******************************************************************\ diff --git a/src/util/string_utils.cpp b/src/util/string_utils.cpp index 9fb81dfa08c..b100c91b3a0 100644 --- a/src/util/string_utils.cpp +++ b/src/util/string_utils.cpp @@ -6,12 +6,12 @@ Author: Daniel Poetzl \*******************************************************************/ +#include "string_utils.h" + #include #include #include -#include "string_utils.h" - /*******************************************************************\ Function: diff --git a/src/util/substitute.cpp b/src/util/substitute.cpp index d83ad9361fe..6c83c7fbf76 100644 --- a/src/util/substitute.cpp +++ b/src/util/substitute.cpp @@ -6,10 +6,10 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#include - #include "substitute.h" +#include + /*******************************************************************\ Function: substitute diff --git a/src/util/symbol.cpp b/src/util/symbol.cpp index d2883832faf..651e99e348c 100644 --- a/src/util/symbol.cpp +++ b/src/util/symbol.cpp @@ -6,9 +6,10 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#include "symbol.h" + #include -#include "symbol.h" #include "source_location.h" #include "std_expr.h" diff --git a/src/util/symbol_table.cpp b/src/util/symbol_table.cpp index 37053b7737b..8de3671795b 100644 --- a/src/util/symbol_table.cpp +++ b/src/util/symbol_table.cpp @@ -6,10 +6,10 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#include - #include "symbol_table.h" +#include + /*******************************************************************\ Function: symbol_tablet::add diff --git a/src/util/tempdir.cpp b/src/util/tempdir.cpp index e160c664558..29a23151e89 100644 --- a/src/util/tempdir.cpp +++ b/src/util/tempdir.cpp @@ -6,6 +6,8 @@ Author: CM Wintersteiger \*******************************************************************/ +#include "tempdir.h" + #ifdef _WIN32 #include #include @@ -25,7 +27,6 @@ Author: CM Wintersteiger #include #endif -#include "tempdir.h" #include "file_util.h" /*******************************************************************\ diff --git a/src/util/tempfile.cpp b/src/util/tempfile.cpp index 023043e232f..b3986e92de8 100644 --- a/src/util/tempfile.cpp +++ b/src/util/tempfile.cpp @@ -6,6 +6,8 @@ Author: Daniel Kroening \*******************************************************************/ +#include "tempfile.h" + #ifdef _WIN32 #include #include @@ -32,8 +34,6 @@ Author: Daniel Kroening #include #endif -#include "tempfile.h" - /*******************************************************************\ Function: my_mkstemps diff --git a/src/util/threeval.cpp b/src/util/threeval.cpp index ea073177df2..04311325043 100644 --- a/src/util/threeval.cpp +++ b/src/util/threeval.cpp @@ -6,10 +6,10 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#include - #include "threeval.h" +#include + const char *tvt::to_string() const { switch(value) diff --git a/src/util/time_stopping.cpp b/src/util/time_stopping.cpp index 3dda40c9ee5..75eb4ababe6 100644 --- a/src/util/time_stopping.cpp +++ b/src/util/time_stopping.cpp @@ -8,6 +8,8 @@ Date: February 2004 \*******************************************************************/ +#include "time_stopping.h" + #include #if defined(_WIN32) && !defined(__MINGW32__) @@ -17,8 +19,6 @@ Date: February 2004 #include #endif -#include "time_stopping.h" - #if defined(_WIN32) && !defined(__MINGW32__) // NOLINTNEXTLINE(readability/identifiers) struct timezone diff --git a/src/util/timer.cpp b/src/util/timer.cpp index 655dcb21ffb..7192b1d9274 100644 --- a/src/util/timer.cpp +++ b/src/util/timer.cpp @@ -8,11 +8,11 @@ Module: Time Stopping \*******************************************************************/ +#include "timer.h" + #include #include -#include "timer.h" - /*******************************************************************\ Function: diff --git a/src/util/type_eq.cpp b/src/util/type_eq.cpp index 0a63181b04f..0882ea29ac8 100644 --- a/src/util/type_eq.cpp +++ b/src/util/type_eq.cpp @@ -6,9 +6,10 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#include "type_eq.h" + #include -#include "type_eq.h" #include "type.h" #include "symbol.h" #include "namespace.h" diff --git a/src/util/ui_message.cpp b/src/util/ui_message.cpp index 1cc32ecf356..fb18abad6eb 100644 --- a/src/util/ui_message.cpp +++ b/src/util/ui_message.cpp @@ -6,6 +6,8 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#include "ui_message.h" + #include #include @@ -13,7 +15,6 @@ Author: Daniel Kroening, kroening@kroening.com #include "json.h" #include "xml_expr.h" #include "cout_message.h" -#include "ui_message.h" #include "cmdline.h" /*******************************************************************\ diff --git a/src/util/unicode.cpp b/src/util/unicode.cpp index 4c997f1a6c3..c0a5d8ab4b9 100644 --- a/src/util/unicode.cpp +++ b/src/util/unicode.cpp @@ -6,14 +6,14 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#include "unicode.h" + #include #include #include #include #include -#include "unicode.h" - #ifdef _WIN32 #include #endif diff --git a/src/util/union_find.cpp b/src/util/union_find.cpp index f37975f32eb..1e4570cd627 100644 --- a/src/util/union_find.cpp +++ b/src/util/union_find.cpp @@ -6,10 +6,10 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ -#include - #include "union_find.h" +#include + /*******************************************************************\ Function: unsigned_union_find::make_union diff --git a/src/util/xml.cpp b/src/util/xml.cpp index aa784c96604..2d1c72f09da 100644 --- a/src/util/xml.cpp +++ b/src/util/xml.cpp @@ -6,10 +6,11 @@ Author: Daniel Kroening, kroening@kroening.com \*******************************************************************/ +#include "xml.h" + #include #include "string2int.h" -#include "xml.h" /*******************************************************************\ diff --git a/src/util/xml_expr.cpp b/src/util/xml_expr.cpp index 236c844f6e5..2f62e5b37f4 100644 --- a/src/util/xml_expr.cpp +++ b/src/util/xml_expr.cpp @@ -8,6 +8,8 @@ Author: Daniel Kroening \*******************************************************************/ +#include "xml_expr.h" + #include "namespace.h" #include "expr.h" #include "xml.h" @@ -17,8 +19,6 @@ Author: Daniel Kroening #include "std_expr.h" #include "config.h" -#include "xml_expr.h" - /*******************************************************************\ Function: xml diff --git a/src/util/xml_irep.cpp b/src/util/xml_irep.cpp index 92bad4df40c..a98f0ffbef3 100644 --- a/src/util/xml_irep.cpp +++ b/src/util/xml_irep.cpp @@ -8,10 +8,11 @@ Author: Daniel Kroening \*******************************************************************/ +#include "xml_irep.h" + #include #include -#include "xml_irep.h" #include "irep.h" #include "xml.h"