Skip to content

Commit 242d224

Browse files
reukreuk
committed
Fix include order in util
1 parent 07ee2fb commit 242d224

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+152
-103
lines changed

‎src/util/arith_tools.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ Author: Daniel Kroening, [email protected]
66
77
\*******************************************************************/
88

9+
#include "arith_tools.h"
10+
911
#include <cassert>
1012

1113
#include "fixedbv.h"
1214
#include "ieee_float.h"
1315
#include "std_types.h"
1416
#include "std_expr.h"
1517

16-
#include "arith_tools.h"
17-
1818
/*******************************************************************\
1919
2020
Function: to_integer

‎src/util/array_name.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Author: Daniel Kroening, [email protected]
77
\*******************************************************************/
88

99
#include "array_name.h"
10+
1011
#include "expr.h"
1112
#include "namespace.h"
1213
#include "symbol.h"

‎src/util/base_type.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ Author: Daniel Kroening, [email protected]
66
77
\*******************************************************************/
88

9+
#include "base_type.h"
10+
911
#include <cassert>
1012
#include <set>
1113

1214
#include "std_types.h"
13-
#include "base_type.h"
1415
#include "namespace.h"
1516
#include "symbol.h"
1617

‎src/util/bv_arithmetic.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@ Author: Daniel Kroening, [email protected]
66
77
\*******************************************************************/
88

9+
#include "bv_arithmetic.h"
10+
911
#include <cassert>
1012
#include <ostream>
1113

1214
#include "string2int.h"
1315
#include "arith_tools.h"
1416
#include "std_types.h"
1517
#include "std_expr.h"
16-
#include "bv_arithmetic.h"
1718

1819
/*******************************************************************\
1920

‎src/util/byte_operators.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ Author: Daniel Kroening, [email protected]
66
77
\*******************************************************************/
88

9+
#include "byte_operators.h"
10+
911
#include <cassert>
1012

11-
#include "byte_operators.h"
1213
#include "config.h"
1314

1415
/*******************************************************************\

‎src/util/cmdline.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ Author: Daniel Kroening, [email protected]
66
77
\*******************************************************************/
88

9+
#include "cmdline.h"
10+
911
#include <cassert>
1012
#include <cstdlib>
1113
#include <iostream>
1214

13-
#include "cmdline.h"
14-
1515
/*******************************************************************\
1616
1717
Function: cmdlinet::cmdlinet

‎src/util/config.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ Author: Daniel Kroening, [email protected]
66
77
\*******************************************************************/
88

9+
#include "config.h"
10+
911
#include <cstdlib>
1012

1113
#include "namespace.h"
12-
#include "config.h"
1314
#include "symbol_table.h"
1415
#include "arith_tools.h"
1516
#include "cmdline.h"

‎src/util/cout_message.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ Author: Daniel Kroening, [email protected]
66
77
\*******************************************************************/
88

9+
#include "cout_message.h"
10+
911
#include <iostream>
1012

1113
#ifdef _WIN32
@@ -16,7 +18,6 @@ Author: Daniel Kroening, [email protected]
1618
#endif
1719

1820
#include "unicode.h"
19-
#include "cout_message.h"
2021

2122
/*******************************************************************\
2223

‎src/util/decision_procedure.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ Author: Daniel Kroening, [email protected]
66
77
\*******************************************************************/
88

9-
#include <cassert>
10-
119
#include "decision_procedure.h"
1210

11+
#include <cassert>
12+
1313
/*******************************************************************\
1414
1515
Function: decision_proceduret::in_core

‎src/util/endianness_map.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@ Author: Daniel Kroening, [email protected]
66
77
\*******************************************************************/
88

9+
#include "endianness_map.h"
10+
911
#include <ostream>
1012
#include <cassert>
1113

1214
#include "std_types.h"
1315
#include "pointer_offset_size.h"
1416
#include "arith_tools.h"
15-
#include "endianness_map.h"
1617
#include "namespace.h"
1718

1819
/*******************************************************************\

‎src/util/expr.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ Author: Daniel Kroening, [email protected]
66
77
\*******************************************************************/
88

9+
#include "expr.h"
10+
911
#include <cassert>
1012

1113
#include <stack>
@@ -14,7 +16,6 @@ Author: Daniel Kroening, [email protected]
1416
#include "mp_arith.h"
1517
#include "fixedbv.h"
1618
#include "ieee_float.h"
17-
#include "expr.h"
1819
#include "rational.h"
1920
#include "rational_tools.h"
2021
#include "arith_tools.h"

‎src/util/expr_util.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Author: Daniel Kroening, [email protected]
77
\*******************************************************************/
88

99
#include "expr_util.h"
10+
1011
#include "expr.h"
1112
#include "fixedbv.h"
1213
#include "ieee_float.h"

‎src/util/file_util.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ Date: January 2012
88
99
\*******************************************************************/
1010

11+
#include "file_util.h"
12+
1113
#include <cerrno>
1214

1315
#if defined(__linux__) || \
@@ -35,8 +37,6 @@ Date: January 2012
3537
#include <cstring>
3638
#endif
3739

38-
#include "file_util.h"
39-
4040
/*******************************************************************\
4141
4242
Function: get_current_working_directory

‎src/util/find_macros.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ Author: Daniel Kroening, [email protected]
66
77
\*******************************************************************/
88

9+
#include "find_macros.h"
10+
911
#include <stack>
1012

11-
#include "find_macros.h"
1213
#include "expr.h"
1314
#include "namespace.h"
1415
#include "symbol.h"

‎src/util/find_symbols.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ Author: Daniel Kroening, [email protected]
66
77
\*******************************************************************/
88

9+
#include "find_symbols.h"
10+
911
#include "std_types.h"
1012
#include "std_expr.h"
1113

12-
#include "find_symbols.h"
13-
1414
enum class kindt { F_TYPE, F_TYPE_NON_PTR, F_EXPR, F_BOTH };
1515

1616
/*******************************************************************\

‎src/util/fixedbv.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ Author: Daniel Kroening, [email protected]
66
77
\*******************************************************************/
88

9+
#include "fixedbv.h"
10+
911
#include "std_types.h"
1012
#include "std_expr.h"
11-
#include "fixedbv.h"
1213
#include "arith_tools.h"
1314

1415
/*******************************************************************\

‎src/util/format_constant.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Author: Daniel Kroening, [email protected]
77
\*******************************************************************/
88

99
#include "format_constant.h"
10+
1011
#include "arith_tools.h"
1112
#include "fixedbv.h"
1213
#include "ieee_float.h"

‎src/util/get_module.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ Author: Daniel Kroening, [email protected]
66
77
\*******************************************************************/
88

9+
#include "get_module.h"
10+
911
#include <list>
1012
#include <set>
1113

12-
#include "get_module.h"
1314
#include "message.h"
1415
#include "symbol_table.h"
1516

‎src/util/guard.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ Author: Daniel Kroening, [email protected]
66
77
\*******************************************************************/
88

9+
#include "guard.h"
10+
911
#include <ostream>
1012

1113
#include "std_expr.h"
1214
#include "simplify_utils.h"
13-
#include "guard.h"
1415

1516
/*******************************************************************\
1617

‎src/util/identifier.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ Author: Daniel Kroening, [email protected]
66
77
\*******************************************************************/
88

9-
#include <cstring>
10-
119
#include "identifier.h"
1210

11+
#include <cstring>
12+
1313
/*******************************************************************\
1414
1515
Function: identifiert::as_string

‎src/util/ieee_float.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ Author: Daniel Kroening, [email protected]
66
77
\*******************************************************************/
88

9+
#include "ieee_float.h"
10+
911
// <cstdint> is yet to come
1012
#include <stdint.h>
1113

@@ -17,7 +19,6 @@ Author: Daniel Kroening, [email protected]
1719
#include "arith_tools.h"
1820
#include "std_types.h"
1921
#include "std_expr.h"
20-
#include "ieee_float.h"
2122

2223
/*******************************************************************\
2324

‎src/util/irep.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@ Author: Daniel Kroening, [email protected]
66
77
\*******************************************************************/
88

9+
#include "irep.h"
10+
911
#include <cassert>
1012
#include <ostream>
1113

1214
#include "string2int.h"
13-
#include "irep.h"
1415
#include "string_hash.h"
1516
#include "irep_hash.h"
1617

‎src/util/irep_hash_container.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Author: Daniel Kroening, [email protected]
77
\*******************************************************************/
88

99
#include "irep_hash_container.h"
10+
1011
#include "irep.h"
1112
#include "irep_hash.h"
1213

‎src/util/irep_ids.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ Author: Daniel Kroening, [email protected]
66
77
\*******************************************************************/
88

9+
#include "irep_ids.h"
10+
911
#include <cassert>
1012

11-
#include "irep_ids.h"
1213
#include "string_container.h"
1314

1415
const char *irep_ids_table[]=

‎src/util/irep_serialization.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@ Date: May 2007
88
99
\*******************************************************************/
1010

11+
#include "irep_serialization.h"
12+
1113
#include <sstream>
1214
#include <iostream>
1315

14-
#include "irep_serialization.h"
1516
#include "string_hash.h"
1617

1718
/*******************************************************************\

‎src/util/json.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ Author: Daniel Kroening, [email protected]
66
77
\*******************************************************************/
88

9-
#include <ostream>
10-
119
#include "json.h"
1210

11+
#include <ostream>
12+
1313
const jsont jsont::null_json_object(jsont::kindt::J_NULL);
1414

1515
/*******************************************************************\

‎src/util/json_expr.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ Author: Peter Schrammel
66
77
\*******************************************************************/
88

9+
#include "json_expr.h"
10+
911
#include "namespace.h"
1012
#include "expr.h"
1113
#include "json.h"
@@ -15,8 +17,6 @@ Author: Peter Schrammel
1517
#include "std_expr.h"
1618
#include "config.h"
1719

18-
#include "json_expr.h"
19-
2020
/*******************************************************************\
2121
2222
Function: json

‎src/util/json_irep.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ Author: Thomas Kiley, [email protected]
66
77
\*******************************************************************/
88

9+
#include "json_irep.h"
10+
911
#include "irep.h"
1012
#include "json.h"
11-
#include "json_irep.h"
1213

1314
#include <algorithm>
1415

‎src/util/language.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Author: Daniel Kroening, [email protected]
77
\*******************************************************************/
88

99
#include "language.h"
10+
1011
#include "expr.h"
1112

1213
/*******************************************************************\

‎src/util/language_file.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ Author: Daniel Kroening, [email protected]
66
77
\*******************************************************************/
88

9+
#include "language_file.h"
10+
911
#include <fstream>
1012

1113
#include "language.h"
12-
#include "language_file.h"
1314

1415
/*******************************************************************\
1516

0 commit comments

Comments
 (0)