Clang-format includes

Author: tautschnig

jbmc/src/java_bytecode/java_local_variable_table.cpp

@@ -11,13 +11,13 @@ Author: Chris Smowton, [email protected]
 
 #include "java_bytecode_convert_method_class.h"
 
-#include "java_types.h"
-
 #include <util/arith_tools.h>
 #include <util/invariant.h>
 #include <util/string2int.h>
 #include <util/symbol_table_base.h>
 
+#include "java_types.h"
+
 #include <iostream>
 
 // Specialise the CFG representation to work over Java instead of GOTO programs.

src/analyses/local_bitvector_analysis.cpp

@@ -11,12 +11,12 @@ Author: Daniel Kroening, [email protected]
 
 #include "local_bitvector_analysis.h"
 
-#include <algorithm>
-
 #include <util/pointer_expr.h>
 #include <util/std_code.h>
 #include <util/symbol.h>
 
+#include <algorithm>
+
 void local_bitvector_analysist::flagst::print(std::ostream &out) const
 {
   if(is_unknown())

src/analyses/uncaught_exceptions_analysis.cpp

@@ -12,14 +12,14 @@ Author: Cristina David
 #ifdef DEBUG
 #include <iostream>
 #endif
-#include "uncaught_exceptions_analysis.h"
-
 #include <util/namespace.h>
 #include <util/pointer_expr.h>
 #include <util/symbol_table_base.h>
 
 #include <goto-programs/goto_functions.h>
 
+#include "uncaught_exceptions_analysis.h"
+
 /// Returns the compile type of an exception
 irep_idt
 uncaught_exceptions_domaint::get_exception_type(const pointer_typet &type)

src/analyses/variable-sensitivity/variable_sensitivity_configuration.cpp

@@ -10,11 +10,11 @@
 /// domain abstractions are used, flow sensitivity, etc
 #include "variable_sensitivity_configuration.h"
 
-#include <limits>
-
 #include <util/exception_utils.h>
 #include <util/options.h>
 
+#include <limits>
+
 static void check_one_of_options(
   const optionst &options,
   const std::vector<std::string> &names);

src/cprover/console.cpp

@@ -16,7 +16,7 @@ Author: Daniel Kroening, [email protected]
 #  include <io.h>
 #  include <windows.h>
 #  define isatty _isatty
-#include <util/unicode.h>
+#  include <util/unicode.h>
 #else
 #  include <unistd.h>
 #endif

src/cprover/cprover_main.cpp

@@ -12,7 +12,7 @@ Author: Daniel Kroening, [email protected]
 #include "cprover_parse_options.h"
 
 #ifdef _MSC_VER
-#include <util/unicode.h>
+#  include <util/unicode.h>
 
 #  include <windows.h>
 #endif

src/goto-instrument/contracts/instrument_spec_assigns.cpp

@@ -20,9 +20,8 @@ Date: January 2022
 #include <util/pointer_predicates.h>
 #include <util/simplify_expr.h>
 
-#include <langapi/language_util.h>
-
 #include <ansi-c/c_expr.h>
+#include <langapi/language_util.h>
 
 #include "cfg_info.h"
 #include "utils.h"

src/goto-programs/goto_program.cpp

@@ -11,11 +11,6 @@ Author: Daniel Kroening, [email protected]
 
 #include "goto_program.h"
 
-#include "validate_code.h"
-
-#include <iomanip>
-#include <map>
-
 #include <util/expr_iterator.h>
 #include <util/find_symbols.h>
 #include <util/format_expr.h>
@@ -29,6 +24,11 @@ Author: Daniel Kroening, [email protected]
 
 #include <langapi/language_util.h>
 
+#include "validate_code.h"
+
+#include <iomanip>
+#include <map>
+
 goto_programt::instructiont goto_programt::make_incomplete_goto(
   const code_gotot &_code,
   const source_locationt &l)

src/goto-programs/graphml_witness.cpp

@@ -21,13 +21,11 @@ Author: Daniel Kroening
 #include <util/string_constant.h>
 #include <util/symbol.h>
 
+#include <ansi-c/expr2c.h>
+#include <goto-symex/symex_target_equation.h>
 #include <langapi/language_util.h>
 #include <langapi/mode.h>
 
-#include <goto-symex/symex_target_equation.h>
-
-#include <ansi-c/expr2c.h>
-
 #include "goto_program.h"
 #include "goto_trace.h"
 

src/goto-programs/rebuild_goto_start_function.cpp

@@ -14,11 +14,11 @@ Author: Thomas Kiley, [email protected]
 #include <util/prefix.h>
 #include <util/symbol_table_base.h>
 
-#include <langapi/mode.h>
-#include <langapi/language.h>
-
 #include <goto-programs/goto_functions.h>
 
+#include <langapi/language.h>
+#include <langapi/mode.h>
+
 #include <memory>
 
 std::unique_ptr<languaget> get_entry_point_language(