remove #include "mathematical_types.h" from std_expr.h

Daniel Kroening · Daniel Kroening · commit 6ae7e0e7223c · 2019-01-22T22:19:10.000Z
std_expr.h is a frequently used header file; removing the (unused) include
from this file has the potential to improve compile times.
diff --git a/src/analyses/constant_propagator.cpp b/src/analyses/constant_propagator.cpp
@@ -23,6 +23,7 @@ Author: Peter Schrammel
 #include <util/expr_util.h>
 #include <util/find_symbols.h>
 #include <util/ieee_float.h>
+#include <util/mathematical_types.h>
 #include <util/simplify_expr.h>
 
 #include <langapi/language_util.h>
diff --git a/src/ansi-c/c_typecast.cpp b/src/ansi-c/c_typecast.cpp
@@ -13,13 +13,14 @@ Author: Daniel Kroening, kroening@kroening.com
 #include <cassert>
 
 #include <util/arith_tools.h>
+#include <util/base_type.h>
 #include <util/c_types.h>
 #include <util/config.h>
 #include <util/expr_util.h>
+#include <util/mathematical_types.h>
+#include <util/simplify_expr.h>
 #include <util/std_expr.h>
-#include <util/base_type.h>
 #include <util/symbol.h>
-#include <util/simplify_expr.h>
 
 #include "c_qualifiers.h"
 
diff --git a/src/ansi-c/c_typecheck_expr.cpp b/src/ansi-c/c_typecheck_expr.cpp
@@ -20,6 +20,7 @@ Author: Daniel Kroening, kroening@kroening.com
 #include <util/cprover_prefix.h>
 #include <util/expr_util.h>
 #include <util/ieee_float.h>
+#include <util/mathematical_types.h>
 #include <util/pointer_offset_size.h>
 #include <util/pointer_predicates.h>
 #include <util/simplify_expr.h>
diff --git a/src/ansi-c/c_typecheck_type.cpp b/src/ansi-c/c_typecheck_type.cpp
@@ -16,6 +16,7 @@ Author: Daniel Kroening, kroening@kroening.com
 #include <util/arith_tools.h>
 #include <util/c_types.h>
 #include <util/config.h>
+#include <util/mathematical_types.h>
 #include <util/pointer_offset_size.h>
 #include <util/simplify_expr.h>
 
diff --git a/src/cpp/cpp_declarator_converter.cpp b/src/cpp/cpp_declarator_converter.cpp
@@ -11,11 +11,11 @@ Author: Daniel Kroening, kroening@cs.cmu.edu
 
 #include "cpp_declarator_converter.h"
 
+#include <util/c_types.h>
+#include <util/mathematical_types.h>
 #include <util/source_location.h>
 #include <util/std_types.h>
 
-#include <util/c_types.h>
-
 #include "cpp_type2name.h"
 #include "cpp_typecheck.h"
 
diff --git a/src/cpp/cpp_typecheck_expr.cpp b/src/cpp/cpp_typecheck_expr.cpp
@@ -20,6 +20,7 @@ Author: Daniel Kroening, kroening@cs.cmu.edu
 #include <util/c_types.h>
 #include <util/config.h>
 #include <util/expr_initializer.h>
+#include <util/mathematical_types.h>
 #include <util/pointer_offset_size.h>
 
 #include <ansi-c/c_qualifiers.h>
diff --git a/src/cpp/cpp_typecheck_resolve.cpp b/src/cpp/cpp_typecheck_resolve.cpp
@@ -20,6 +20,7 @@ Author: Daniel Kroening, kroening@cs.cmu.edu
 
 #include <util/arith_tools.h>
 #include <util/c_types.h>
+#include <util/mathematical_types.h>
 #include <util/prefix.h>
 #include <util/std_expr.h>
 #include <util/std_types.h>
diff --git a/src/goto-programs/goto_convert_side_effect.cpp b/src/goto-programs/goto_convert_side_effect.cpp
@@ -15,6 +15,7 @@ Author: Daniel Kroening, kroening@kroening.com
 #include <util/cprover_prefix.h>
 #include <util/expr_util.h>
 #include <util/fresh_symbol.h>
+#include <util/mathematical_types.h>
 #include <util/std_expr.h>
 #include <util/symbol.h>
 
diff --git a/src/goto-programs/interpreter.cpp b/src/goto-programs/interpreter.cpp
@@ -21,6 +21,7 @@ Author: Daniel Kroening, kroening@kroening.com
 #include <util/fixedbv.h>
 #include <util/ieee_float.h>
 #include <util/invariant.h>
+#include <util/mathematical_types.h>
 #include <util/message.h>
 #include <util/std_expr.h>
 #include <util/std_types.h>
diff --git a/src/linking/linking.cpp b/src/linking/linking.cpp
@@ -17,6 +17,7 @@ Author: Daniel Kroening, kroening@kroening.com
 
 #include <util/base_type.h>
 #include <util/find_symbols.h>
+#include <util/mathematical_types.h>
 #include <util/pointer_offset_size.h>
 #include <util/simplify_expr.h>
 
diff --git a/src/solvers/smt2/smt2_parser.h b/src/solvers/smt2/smt2_parser.h
@@ -11,6 +11,7 @@ Author: Daniel Kroening, kroening@kroening.com
 
 #include <map>
 
+#include <util/mathematical_types.h>
 #include <util/std_expr.h>
 
 #include "smt2_tokenizer.h"
diff --git a/src/util/rational_tools.cpp b/src/util/rational_tools.cpp
@@ -11,8 +11,8 @@ Author: Daniel Kroening, kroening@kroening.com
 
 #include "rational_tools.h"
 
+#include "mathematical_types.h"
 #include "rational.h"
-#include "std_types.h"
 
 static mp_integer power10(size_t i)
 {
diff --git a/src/util/std_expr.cpp b/src/util/std_expr.cpp
@@ -15,6 +15,7 @@ Author: Daniel Kroening, kroening@kroening.com
 #include "arith_tools.h"
 #include "byte_operators.h"
 #include "c_types.h"
+#include "mathematical_types.h"
 #include "pointer_offset_size.h"
 
 bool constant_exprt::value_is_zero_string() const
diff --git a/src/util/std_expr.h b/src/util/std_expr.h
@@ -16,7 +16,6 @@ Author: Daniel Kroening, kroening@kroening.com
 #include "base_type.h"
 #include "expr_cast.h"
 #include "invariant.h"
-#include "mathematical_types.h"
 #include "std_types.h"
 
 /// An expression without operands
diff --git a/unit/analyses/constant_propagator.cpp b/unit/analyses/constant_propagator.cpp
@@ -14,6 +14,7 @@ Author: Diffblue Ltd
 #include <goto-programs/goto_convert_functions.h>
 
 #include <util/arith_tools.h>
+#include <util/mathematical_types.h>
 #include <util/message.h>
 
 static bool starts_with_x(const exprt &e, const namespacet &)
diff --git a/unit/analyses/does_remove_const/does_expr_lose_const.cpp b/unit/analyses/does_remove_const/does_expr_lose_const.cpp
@@ -11,13 +11,16 @@ Author: Diffblue Ltd.
 
 #include <testing-utils/use_catch.h>
 
-#include <util/std_expr.h>
+#include <util/c_types.h>
+#include <util/mathematical_types.h>
 #include <util/std_code.h>
+#include <util/std_expr.h>
 #include <util/std_types.h>
-#include <util/c_types.h>
 
 #include <ansi-c/c_qualifiers.h>
+
 #include <goto-programs/goto_program.h>
+
 #include <analyses/does_remove_const.h>
 #include <analyses/does_remove_const/does_remove_const_util.h>
 
diff --git a/unit/analyses/does_remove_const/does_type_preserve_const_correctness.cpp b/unit/analyses/does_remove_const/does_type_preserve_const_correctness.cpp
@@ -12,11 +12,14 @@ Author: Diffblue Ltd.
 #include <testing-utils/use_catch.h>
 
 #include <util/c_types.h>
+#include <util/mathematical_types.h>
 #include <util/namespace.h>
 #include <util/symbol_table.h>
 
 #include <ansi-c/c_qualifiers.h>
+
 #include <goto-programs/goto_program.h>
+
 #include <analyses/does_remove_const/does_remove_const_util.h>
 #include <analyses/does_remove_const.h>
 
diff --git a/unit/analyses/does_remove_const/is_type_at_least_as_const_as.cpp b/unit/analyses/does_remove_const/is_type_at_least_as_const_as.cpp
@@ -12,11 +12,14 @@ Author: Diffblue Ltd.
 #include <testing-utils/use_catch.h>
 
 #include <util/c_types.h>
+#include <util/mathematical_types.h>
 #include <util/namespace.h>
 #include <util/symbol_table.h>
 
 #include <ansi-c/c_qualifiers.h>
+
 #include <goto-programs/goto_program.h>
+
 #include <analyses/does_remove_const/does_remove_const_util.h>
 #include <analyses/does_remove_const.h>
 
diff --git a/unit/util/std_expr.cpp b/unit/util/std_expr.cpp
@@ -7,7 +7,9 @@ Author: Diffblue Ltd
 \*******************************************************************/
 
 #include <testing-utils/use_catch.h>
+
 #include <util/arith_tools.h>
+#include <util/mathematical_types.h>
 #include <util/std_expr.h>
 #include <util/std_types.h>
 
