Reorder includes as per clang-format rules

Author: tautschnig

src/ansi-c/c_typecheck_expr.cpp

@@ -9,11 +9,6 @@ Author: Daniel Kroening, [email protected]
 /// \file
 /// ANSI-C Language Type Checking
 
-#include "c_typecheck_base.h"
-
-#include <cassert>
-#include <sstream>
-
 #include <util/arith_tools.h>
 #include <util/bitvector_expr.h>
 #include <util/c_types.h>
@@ -40,10 +35,14 @@ Author: Daniel Kroening, [email protected]
 #include "builtin_factory.h"
 #include "c_expr.h"
 #include "c_qualifiers.h"
+#include "c_typecheck_base.h"
 #include "expr2c.h"
 #include "padding.h"
 #include "type2name.h"
 
+#include <cassert>
+#include <sstream>
+
 void c_typecheck_baset::typecheck_expr(exprt &expr)
 {
   if(expr.id()==ID_already_typechecked)

src/ansi-c/c_typecheck_type.cpp

@@ -9,13 +9,6 @@ Author: Daniel Kroening, [email protected]
 /// \file
 /// C++ Language Type Checking
 
-#include "c_typecheck_base.h"
-
-#include <cassert>
-#include <unordered_set>
-
-#include <goto-programs/goto_instruction_code.h>
-
 #include <util/arith_tools.h>
 #include <util/c_types.h>
 #include <util/config.h>
@@ -25,14 +18,20 @@ Author: Daniel Kroening, [email protected]
 #include <util/pointer_offset_size.h>
 #include <util/simplify_expr.h>
 
+#include <goto-programs/goto_instruction_code.h>
+
 #include "ansi_c_convert_type.h"
 #include "ansi_c_declaration.h"
 #include "c_qualifiers.h"
+#include "c_typecheck_base.h"
 #include "gcc_types.h"
 #include "padding.h"
 #include "type2name.h"
 #include "typedef_type.h"
 
+#include <cassert>
+#include <unordered_set>
+
 void c_typecheck_baset::typecheck_type(typet &type)
 {
   // we first convert, and then check

src/cpp/cpp_instantiate_template.cpp

@@ -15,13 +15,13 @@ Author: Daniel Kroening, [email protected]
 #include <iostream>
 #endif
 
-#include <cassert>
-
 #include <util/arith_tools.h>
 #include <util/base_exceptions.h>
 
 #include "cpp_type2name.h"
 
+#include <cassert>
+
 std::string cpp_typecheckt::template_suffix(
   const cpp_template_args_tct &template_args)
 {

src/cpp/cpp_typecheck.cpp

@@ -11,9 +11,6 @@ Author: Daniel Kroening, [email protected]
 
 #include "cpp_typecheck.h"
 
-#include <algorithm>
-#include <cassert>
-
 #include <util/pointer_expr.h>
 #include <util/source_location.h>
 #include <util/symbol.h>
@@ -24,6 +21,9 @@ Author: Daniel Kroening, [email protected]
 #include "cpp_util.h"
 #include "expr2cpp.h"
 
+#include <algorithm>
+#include <cassert>
+
 void cpp_typecheckt::convert(cpp_itemt &item)
 {
   if(item.is_declaration())

src/cpp/cpp_typecheck_code.cpp

@@ -9,15 +9,14 @@ Author: Daniel Kroening, [email protected]
 /// \file
 /// C++ Language Type Checking
 
-#include "cpp_typecheck.h"
-
 #include <util/arith_tools.h>
 #include <util/bitvector_expr.h>
 #include <util/pointer_expr.h>
 #include <util/source_location.h>
 
 #include "cpp_declarator_converter.h"
 #include "cpp_exception_id.h"
+#include "cpp_typecheck.h"
 #include "cpp_typecheck_fargs.h"
 #include "cpp_util.h"
 

src/cpp/cpp_typecheck_compound_type.cpp

@@ -15,12 +15,9 @@ Author: Daniel Kroening, [email protected]
 #include <iostream>
 #endif
 
-#include <algorithm>
-#include <cassert>
-
 #include <util/arith_tools.h>
-#include <util/std_types.h>
 #include <util/c_types.h>
+#include <util/std_types.h>
 
 #include <ansi-c/c_qualifiers.h>
 
@@ -29,6 +26,9 @@ Author: Daniel Kroening, [email protected]
 #include "cpp_type2name.h"
 #include "cpp_util.h"
 
+#include <algorithm>
+#include <cassert>
+
 bool cpp_typecheckt::has_const(const typet &type)
 {
   if(type.id()==ID_const)

src/cpp/cpp_typecheck_constructor.cpp

@@ -9,15 +9,15 @@ Author: Daniel Kroening, [email protected]
 /// \file
 /// C++ Language Type Checking
 
-#include "cpp_typecheck.h"
-
-#include <goto-programs/goto_instruction_code.h>
-
 #include <util/arith_tools.h>
 #include <util/c_types.h>
 #include <util/pointer_expr.h>
 #include <util/std_code.h>
 
+#include <goto-programs/goto_instruction_code.h>
+
+#include "cpp_typecheck.h"
+
 #include <cassert>
 
 /// Generate code to copy the parent.

src/cpp/cpp_typecheck_conversions.cpp

@@ -9,8 +9,6 @@ Module: C++ Language Type Checking
 /// \file
 /// C++ Language Type Checking
 
-#include "cpp_typecheck.h"
-
 #include <util/arith_tools.h>
 #include <util/c_types.h>
 #include <util/config.h>
@@ -21,6 +19,7 @@ Module: C++ Language Type Checking
 
 #include <ansi-c/c_qualifiers.h>
 
+#include "cpp_typecheck.h"
 #include "cpp_util.h"
 
 #include <cassert>

src/cpp/cpp_typecheck_expr.cpp

@@ -15,8 +15,6 @@ Author: Daniel Kroening, [email protected]
 #include <iostream>
 #endif
 
-#include <cassert>
-
 #include <util/arith_tools.h>
 #include <util/c_types.h>
 #include <util/config.h>
@@ -33,6 +31,8 @@ Author: Daniel Kroening, [email protected]
 #include "cpp_util.h"
 #include "expr2cpp.h"
 
+#include <cassert>
+
 bool cpp_typecheckt::find_parent(
   const symbolt &symb,
   const irep_idt &base_name,

src/cpp/cpp_typecheck_resolve.cpp

@@ -15,9 +15,6 @@ Author: Daniel Kroening, [email protected]
 #include <iostream>
 #endif
 
-#include <algorithm>
-#include <cassert>
-
 #include <util/arith_tools.h>
 #include <util/c_types.h>
 #include <util/mathematical_types.h>
@@ -35,6 +32,9 @@ Author: Daniel Kroening, [email protected]
 #include "cpp_typecheck_fargs.h"
 #include "cpp_util.h"
 
+#include <algorithm>
+#include <cassert>
+
 cpp_typecheck_resolvet::cpp_typecheck_resolvet(cpp_typecheckt &_cpp_typecheck):
   cpp_typecheck(_cpp_typecheck),
   original_scope(nullptr) // set in resolve_scope()

src/cpp/cpp_typecheck_template.cpp

@@ -9,16 +9,15 @@ Author: Daniel Kroening, [email protected]
 /// \file
 /// C++ Language Type Checking
 
-#include "cpp_typecheck.h"
-
 #include <util/base_exceptions.h>
 #include <util/simplify_expr.h>
 
-#include "cpp_type2name.h"
-#include "cpp_declarator_converter.h"
-#include "cpp_template_type.h"
 #include "cpp_convert_type.h"
+#include "cpp_declarator_converter.h"
 #include "cpp_template_args.h"
+#include "cpp_template_type.h"
+#include "cpp_type2name.h"
+#include "cpp_typecheck.h"
 
 #include <cassert>
 

src/cpp/cpp_typecheck_type.cpp

@@ -9,15 +9,14 @@ Author: Daniel Kroening, [email protected]
 /// \file
 /// C++ Language Type Checking
 
-#include "cpp_typecheck.h"
-
-#include <util/source_location.h>
-#include <util/simplify_expr.h>
 #include <util/c_types.h>
+#include <util/simplify_expr.h>
+#include <util/source_location.h>
 
 #include <ansi-c/c_qualifiers.h>
 
 #include "cpp_convert_type.h"
+#include "cpp_typecheck.h"
 #include "cpp_typecheck_fargs.h"
 
 #include <cassert>

src/cpp/parse.cpp

@@ -9,20 +9,19 @@ Author: Daniel Kroening, [email protected]
 /// \file
 /// C++ Language Parsing
 
-#include "cpp_parser.h"
-
-#include <cassert>
-#include <map>
-
 #include <util/c_types.h>
 #include <util/std_code.h>
 
 #include <ansi-c/ansi_c_y.tab.h>
 #include <ansi-c/merged_type.h>
 
-#include "cpp_token_buffer.h"
-#include "cpp_member_spec.h"
 #include "cpp_enum_type.h"
+#include "cpp_member_spec.h"
+#include "cpp_parser.h"
+#include "cpp_token_buffer.h"
+
+#include <cassert>
+#include <map>
 
 #ifdef DEBUG
 #include <iostream>

src/goto-diff/change_impact.cpp

@@ -13,15 +13,15 @@ Date: April 2016
 
 #include "change_impact.h"
 
-#include <cassert>
-#include <iostream>
-
 #include <goto-programs/goto_model.h>
 
 #include <analyses/dependence_graph.h>
 
 #include "unified_diff.h"
 
+#include <cassert>
+#include <iostream>
+
 #if 0
   struct cfg_nodet
   {

src/goto-instrument/goto_program2code.cpp

@@ -11,9 +11,6 @@ Author: Daniel Kroening, [email protected]
 
 #include "goto_program2code.h"
 
-#include <cassert>
-#include <sstream>
-
 #include <util/arith_tools.h>
 #include <util/c_types.h>
 #include <util/expr_util.h>
@@ -22,6 +19,9 @@ Author: Daniel Kroening, [email protected]
 #include <util/prefix.h>
 #include <util/simplify_expr.h>
 
+#include <cassert>
+#include <sstream>
+
 void goto_program2codet::operator()()
 {
   // labels stored for cleanup

src/goto-instrument/k_induction.cpp

@@ -11,11 +11,11 @@ Author: Daniel Kroening, [email protected]
 
 #include "k_induction.h"
 
-#include <analyses/natural_loops.h>
-#include <analyses/local_may_alias.h>
-
 #include <goto-programs/remove_skip.h>
 
+#include <analyses/local_may_alias.h>
+#include <analyses/natural_loops.h>
+
 #include "havoc_utils.h"
 #include "loop_utils.h"
 #include "unwind.h"

src/goto-instrument/unwind.cpp

@@ -16,15 +16,15 @@ Author: Daniel Kroening, [email protected]
 #include <iostream>
 #endif
 
-#include <cassert>
-
 #include <util/expr_util.h>
 #include <util/std_expr.h>
 
 #include <goto-programs/goto_functions.h>
 
 #include "unwindset.h"
 
+#include <cassert>
+
 void goto_unwindt::copy_segment(
   const goto_programt::const_targett start,
   const goto_programt::const_targett end, // exclusive

src/goto-instrument/wmm/cycle_collection.cpp

@@ -11,10 +11,10 @@ Date: 2012
 /// \file
 /// collection of cycles in graph of abstract events
 
-#include "event_graph.h"
-
 #include <util/message.h>
 
+#include "event_graph.h"
+
 #include <cassert>
 
 /// after the collection, eliminates the executions forbidden by an indirect

src/goto-instrument/wmm/goto2graph.cpp

@@ -13,20 +13,19 @@ Date: 2012
 
 #include "goto2graph.h"
 
-#include <cassert>
-#include <vector>
-#include <string>
-#include <fstream>
-
 #include <util/options.h>
 #include <util/prefix.h>
 
-#include <linking/static_lifetime_init.h>
-
 #include <goto-instrument/rw_set.h>
+#include <linking/static_lifetime_init.h>
 
 #include "fence.h"
 
+#include <cassert>
+#include <fstream>
+#include <string>
+#include <vector>
+
 // #define PRINT_UNSAFES