Skip to content

Commit 6c59fc8

Browse files
authored
Merge pull request #5759 from diffblue/bitvector_expr_h
move bitvector-related expression classes into separate header file
2 parents 0f57d77 + 7b0cc28 commit 6c59fc8

35 files changed

+772
-711
lines changed

jbmc/src/java_bytecode/character_refine_preprocess.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ Date: March 2017
1616
#include "character_refine_preprocess.h"
1717

1818
#include <util/arith_tools.h>
19+
#include <util/bitvector_expr.h>
1920
#include <util/std_expr.h>
2021

2122
/// converts based on a function on expressions

jbmc/src/java_bytecode/java_string_library_preprocess.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@ Date: April 2017
1717
/// java.lang.StringBuilder, java.lang.StringBuffer.
1818

1919
#include <goto-programs/class_identifier.h>
20+
2021
#include <util/allocate_objects.h>
2122
#include <util/arith_tools.h>
23+
#include <util/bitvector_expr.h>
2224
#include <util/c_types.h>
2325
#include <util/expr_initializer.h>
2426
#include <util/fresh_symbol.h>

scripts/expected_doxygen_warnings.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ warning: Include graph for 'cbmc_parse_options.cpp' not generated, too many node
8383
warning: Include graph for 'goto_instrument_parse_options.cpp' not generated, too many nodes (97), threshold is 60. Consider increasing DOT_GRAPH_MAX_NODES.
8484
warning: Included by graph for 'goto_functions.h' not generated, too many nodes (66), threshold is 60. Consider increasing DOT_GRAPH_MAX_NODES.
8585
warning: Included by graph for 'goto_model.h' not generated, too many nodes (109), threshold is 60. Consider increasing DOT_GRAPH_MAX_NODES.
86-
warning: Included by graph for 'arith_tools.h' not generated, too many nodes (181), threshold is 60. Consider increasing DOT_GRAPH_MAX_NODES.
86+
warning: Included by graph for 'arith_tools.h' not generated, too many nodes (182), threshold is 60. Consider increasing DOT_GRAPH_MAX_NODES.
8787
warning: Included by graph for 'c_types.h' not generated, too many nodes (110), threshold is 60. Consider increasing DOT_GRAPH_MAX_NODES.
8888
warning: Included by graph for 'config.h' not generated, too many nodes (85), threshold is 60. Consider increasing DOT_GRAPH_MAX_NODES.
8989
warning: Included by graph for 'exception_utils.h' not generated, too many nodes (61), threshold is 60. Consider increasing DOT_GRAPH_MAX_NODES.
@@ -96,6 +96,6 @@ warning: Included by graph for 'namespace.h' not generated, too many nodes (112)
9696
warning: Included by graph for 'prefix.h' not generated, too many nodes (86), threshold is 60. Consider increasing DOT_GRAPH_MAX_NODES.
9797
warning: Included by graph for 'simplify_expr.h' not generated, too many nodes (76), threshold is 60. Consider increasing DOT_GRAPH_MAX_NODES.
9898
warning: Included by graph for 'std_code.h' not generated, too many nodes (78), threshold is 60. Consider increasing DOT_GRAPH_MAX_NODES.
99-
warning: Included by graph for 'std_expr.h' not generated, too many nodes (247), threshold is 60. Consider increasing DOT_GRAPH_MAX_NODES.
99+
warning: Included by graph for 'std_expr.h' not generated, too many nodes (248), threshold is 60. Consider increasing DOT_GRAPH_MAX_NODES.
100100
warning: Included by graph for 'std_types.h' not generated, too many nodes (124), threshold is 60. Consider increasing DOT_GRAPH_MAX_NODES.
101101
warning: Included by graph for 'symbol_table.h' not generated, too many nodes (95), threshold is 60. Consider increasing DOT_GRAPH_MAX_NODES.

src/analyses/goto_check.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ Author: Daniel Kroening, [email protected]
1515

1616
#include <util/arith_tools.h>
1717
#include <util/array_name.h>
18+
#include <util/bitvector_expr.h>
1819
#include <util/c_types.h>
1920
#include <util/config.h>
2021
#include <util/cprover_prefix.h>

src/analyses/goto_rw.cpp

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,16 @@ Date: April 2010
1414
#include <limits>
1515
#include <memory>
1616

17-
#include <util/expr_util.h>
18-
#include <util/std_code.h>
19-
#include <util/std_expr.h>
20-
#include <util/pointer_offset_size.h>
17+
#include <util/arith_tools.h>
18+
#include <util/bitvector_expr.h>
2119
#include <util/byte_operators.h>
2220
#include <util/endianness_map.h>
23-
#include <util/arith_tools.h>
24-
#include <util/simplify_expr.h>
21+
#include <util/expr_util.h>
2522
#include <util/make_unique.h>
23+
#include <util/pointer_offset_size.h>
24+
#include <util/simplify_expr.h>
25+
#include <util/std_code.h>
26+
#include <util/std_expr.h>
2627

2728
#include <langapi/language_util.h>
2829

src/ansi-c/c_typecheck_base.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@ Author: Daniel Kroening, [email protected]
1212
#ifndef CPROVER_ANSI_C_C_TYPECHECK_BASE_H
1313
#define CPROVER_ANSI_C_C_TYPECHECK_BASE_H
1414

15-
#include <util/symbol_table.h>
16-
#include <util/typecheck.h>
15+
#include <util/bitvector_expr.h>
1716
#include <util/namespace.h>
1817
#include <util/std_code.h>
1918
#include <util/std_expr.h>
2019
#include <util/std_types.h>
20+
#include <util/symbol_table.h>
21+
#include <util/typecheck.h>
2122

2223
#include "ansi_c_declaration.h"
2324
#include "designator.h"

src/ansi-c/expr2c_class.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ Author: Daniel Kroening, [email protected]
1616
#include <unordered_map>
1717
#include <unordered_set>
1818

19+
#include <util/bitvector_expr.h>
1920
#include <util/byte_operators.h>
2021
#include <util/mathematical_expr.h>
2122
#include <util/std_code.h>

src/goto-programs/interpreter_evaluate.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Author: Daniel Kroening, [email protected]
1111

1212
#include "interpreter_class.h"
1313

14+
#include <util/bitvector_expr.h>
1415
#include <util/byte_operators.h>
1516
#include <util/fixedbv.h>
1617
#include <util/ieee_float.h>

src/solvers/flattening/boolbv.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Author: Daniel Kroening, [email protected]
1313
#include <set>
1414

1515
#include <util/arith_tools.h>
16+
#include <util/bitvector_expr.h>
1617
#include <util/magic.h>
1718
#include <util/mp_arith.h>
1819
#include <util/prefix.h>

src/solvers/flattening/boolbv.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,13 @@ Author: Daniel Kroening, [email protected]
2626
#include "boolbv_map.h"
2727
#include "arrays.h"
2828

29+
class array_comprehension_exprt;
30+
class bswap_exprt;
31+
class concatenation_exprt;
2932
class extractbit_exprt;
3033
class extractbits_exprt;
31-
class array_comprehension_exprt;
3234
class member_exprt;
35+
class replication_exprt;
3336

3437
class boolbvt:public arrayst
3538
{

0 commit comments

Comments
 (0)