diff --git a/src/util/mathematical_expr.h b/src/util/mathematical_expr.h index 84647ef85c9..b9ad73a0931 100644 --- a/src/util/mathematical_expr.h +++ b/src/util/mathematical_expr.h @@ -97,11 +97,6 @@ inline transt &to_trans_expr(exprt &expr) class power_exprt : public binary_exprt { public: - DEPRECATED(SINCE(2018, 9, 21, "use power_exprt(lhs, rhs) instead")) - power_exprt() : binary_exprt(ID_power) - { - } - power_exprt(const exprt &_base, const exprt &_exp) : binary_exprt(_base, ID_power, _exp) { @@ -146,11 +141,6 @@ inline power_exprt &to_power_expr(exprt &expr) class factorial_power_exprt : public binary_exprt { public: - DEPRECATED(SINCE(2018, 9, 21, "use factorial_power_exprt(lhs, rhs) instead")) - factorial_power_exprt() : binary_exprt(ID_factorial_power) - { - } - factorial_power_exprt(const exprt &_base, const exprt &_exp) : binary_exprt(_base, ID_factorial_power, _exp) { diff --git a/src/util/std_expr.h b/src/util/std_expr.h index 05250e5b58f..5fc8683a5f4 100644 --- a/src/util/std_expr.h +++ b/src/util/std_expr.h @@ -23,12 +23,6 @@ Author: Daniel Kroening, kroening@kroening.com class nullary_exprt : public expr_protectedt { public: - // constructors - DEPRECATED(SINCE(2018, 9, 21, "use nullary_exprt(id, type) instead")) - explicit nullary_exprt(const irep_idt &_id) : expr_protectedt(_id, typet()) - { - } - nullary_exprt(const irep_idt &_id, typet _type) : expr_protectedt(_id, std::move(_type)) { @@ -68,14 +62,6 @@ class ternary_exprt : public expr_protectedt operands().resize(3); } - DEPRECATED( - SINCE(2018, 9, 21, "use ternary_exprt(id, op0, op1, op2, type) instead")) - explicit ternary_exprt(const irep_idt &_id, const typet &_type) - : expr_protectedt(_id, _type) - { - operands().resize(3); - } - ternary_exprt( const irep_idt &_id, exprt _op0, @@ -102,18 +88,6 @@ class ternary_exprt : public expr_protectedt class symbol_exprt : public nullary_exprt { public: - DEPRECATED(SINCE(2018, 9, 21, "use symbol_exprt(identifier, type) instead")) - symbol_exprt() : nullary_exprt(ID_symbol) - { - } - - /// \param identifier: Name of symbol - DEPRECATED(SINCE(2018, 9, 21, "use symbol_exprt(identifier, type) instead")) - explicit symbol_exprt(const irep_idt &identifier) : nullary_exprt(ID_symbol) - { - set_identifier(identifier); - } - /// \param type: Type of symbol explicit symbol_exprt(typet type) : nullary_exprt(ID_symbol, std::move(type)) { @@ -152,28 +126,6 @@ class symbol_exprt : public nullary_exprt class decorated_symbol_exprt:public symbol_exprt { public: - DEPRECATED( - SINCE(2018, 9, 21, "use decorated_symbol_exprt(identifier, type) instead")) - decorated_symbol_exprt() - { - } - - /// \param identifier: Name of symbol - DEPRECATED( - SINCE(2018, 9, 21, "use decorated_symbol_exprt(identifier, type) instead")) - explicit decorated_symbol_exprt(const irep_idt &identifier): - symbol_exprt(identifier) - { - } - - /// \param type: Type of symbol - DEPRECATED( - SINCE(2018, 9, 21, "use decorated_symbol_exprt(identifier, type) instead")) - explicit decorated_symbol_exprt(const typet &type): - symbol_exprt(type) - { - } - /// \param identifier: Name of symbol /// \param type: Type of symbol decorated_symbol_exprt(const irep_idt &identifier, typet type) @@ -310,18 +262,6 @@ inline nondet_symbol_exprt &to_nondet_symbol_expr(exprt &expr) class unary_exprt : public expr_protectedt { public: - DEPRECATED(SINCE(2018, 9, 21, "use unary_exprt(id, op) instead")) - unary_exprt() : expr_protectedt(irep_idt(), typet()) - { - operands().resize(1); - } - - DEPRECATED(SINCE(2018, 9, 21, "use unary_exprt(id, op) instead")) - explicit unary_exprt(const irep_idt &_id) : expr_protectedt(_id, typet()) - { - operands().resize(1); - } - unary_exprt(const irep_idt &_id, const exprt &_op) : expr_protectedt(_id, _op.type(), {_op}) { @@ -394,11 +334,6 @@ inline unary_exprt &to_unary_expr(exprt &expr) class abs_exprt:public unary_exprt { public: - DEPRECATED(SINCE(2018, 9, 21, "use abs_exprt(op) instead")) - abs_exprt() - { - } - explicit abs_exprt(exprt _op) : unary_exprt(ID_abs, std::move(_op)) { } @@ -443,11 +378,6 @@ inline abs_exprt &to_abs_expr(exprt &expr) class unary_minus_exprt:public unary_exprt { public: - DEPRECATED(SINCE(2018, 9, 21, "use unary_minus_exprt(op) instead")) - unary_minus_exprt():unary_exprt(ID_unary_minus) - { - } - unary_minus_exprt(exprt _op, typet _type) : unary_exprt(ID_unary_minus, std::move(_op), std::move(_type)) { @@ -707,12 +637,6 @@ inline sign_exprt &to_sign_expr(exprt &expr) class binary_exprt : public expr_protectedt { public: - DEPRECATED(SINCE(2018, 9, 21, "use binary_exprt(lhs, id, rhs) instead")) - binary_exprt() : expr_protectedt(irep_idt(), typet()) - { - operands().resize(2); - } - DEPRECATED(SINCE(2018, 9, 21, "use binary_exprt(lhs, id, rhs) instead")) explicit binary_exprt(const irep_idt &_id) : expr_protectedt(_id, typet()) { @@ -938,11 +862,6 @@ inline binary_relation_exprt &to_binary_relation_expr(exprt &expr) class multi_ary_exprt : public expr_protectedt { public: - DEPRECATED(SINCE(2018, 9, 21, "use multi_ary_exprt(id, op, type) instead")) - multi_ary_exprt() : expr_protectedt(irep_idt(), typet()) - { - } - DEPRECATED(SINCE(2018, 9, 21, "use multi_ary_exprt(id, op, type) instead")) explicit multi_ary_exprt(const irep_idt &_id) : expr_protectedt(_id, typet()) { @@ -1044,11 +963,6 @@ inline multi_ary_exprt &to_multi_ary_expr(exprt &expr) class plus_exprt:public multi_ary_exprt { public: - DEPRECATED(SINCE(2018, 9, 21, "use plus_exprt(lhs, rhs) instead")) - plus_exprt():multi_ary_exprt(ID_plus) - { - } - DEPRECATED(SINCE(2019, 1, 12, "use plus_exprt(lhs, rhs, type) instead")) plus_exprt(const typet &type) : multi_ary_exprt(ID_plus, type) { @@ -1113,11 +1027,6 @@ inline plus_exprt &to_plus_expr(exprt &expr) class minus_exprt:public binary_exprt { public: - DEPRECATED(SINCE(2018, 9, 21, "use minus_exprt(lhs, rhs) instead")) - minus_exprt():binary_exprt(ID_minus) - { - } - minus_exprt(exprt _lhs, exprt _rhs) : binary_exprt(std::move(_lhs), ID_minus, std::move(_rhs)) { @@ -1164,11 +1073,6 @@ inline minus_exprt &to_minus_expr(exprt &expr) class mult_exprt:public multi_ary_exprt { public: - DEPRECATED(SINCE(2018, 9, 21, "use mult_exprt(lhs, rhs) instead")) - mult_exprt():multi_ary_exprt(ID_mult) - { - } - mult_exprt(exprt _lhs, exprt _rhs) : multi_ary_exprt(std::move(_lhs), ID_mult, std::move(_rhs)) { @@ -1214,11 +1118,6 @@ inline mult_exprt &to_mult_expr(exprt &expr) class div_exprt:public binary_exprt { public: - DEPRECATED(SINCE(2018, 9, 21, "use div_exprt(lhs, rhs) instead")) - div_exprt():binary_exprt(ID_div) - { - } - div_exprt(exprt _lhs, exprt _rhs) : binary_exprt(std::move(_lhs), ID_div, std::move(_rhs)) { @@ -1288,11 +1187,6 @@ inline div_exprt &to_div_expr(exprt &expr) class mod_exprt:public binary_exprt { public: - DEPRECATED(SINCE(2018, 9, 21, "use mod_exprt(lhs, rhs) instead")) - mod_exprt():binary_exprt(ID_mod) - { - } - mod_exprt(exprt _lhs, exprt _rhs) : binary_exprt(std::move(_lhs), ID_mod, std::move(_rhs)) { @@ -1338,11 +1232,6 @@ inline mod_exprt &to_mod_expr(exprt &expr) class rem_exprt:public binary_exprt { public: - DEPRECATED(SINCE(2018, 9, 21, "use rem_exprt(lhs, rhs) instead")) - rem_exprt():binary_exprt(ID_rem) - { - } - rem_exprt(exprt _lhs, exprt _rhs) : binary_exprt(std::move(_lhs), ID_rem, std::move(_rhs)) { @@ -1388,11 +1277,6 @@ inline rem_exprt &to_rem_expr(exprt &expr) class equal_exprt:public binary_relation_exprt { public: - DEPRECATED(SINCE(2018, 9, 21, "use equal_exprt(lhs, rhs) instead")) - equal_exprt():binary_relation_exprt(ID_equal) - { - } - equal_exprt(exprt _lhs, exprt _rhs) : binary_relation_exprt(std::move(_lhs), ID_equal, std::move(_rhs)) { @@ -1451,11 +1335,6 @@ inline equal_exprt &to_equal_expr(exprt &expr) class notequal_exprt:public binary_relation_exprt { public: - DEPRECATED(SINCE(2018, 9, 21, "use notequal_exprt(lhs, rhs) instead")) - notequal_exprt():binary_relation_exprt(ID_notequal) - { - } - notequal_exprt(exprt _lhs, exprt _rhs) : binary_relation_exprt(std::move(_lhs), ID_notequal, std::move(_rhs)) { @@ -1501,16 +1380,6 @@ inline notequal_exprt &to_notequal_expr(exprt &expr) class index_exprt:public binary_exprt { public: - DEPRECATED(SINCE(2018, 9, 21, "use index_exprt(array, index) instead")) - index_exprt():binary_exprt(ID_index) - { - } - - DEPRECATED(SINCE(2018, 9, 21, "use index_exprt(array, index) instead")) - explicit index_exprt(const typet &_type):binary_exprt(ID_index, _type) - { - } - index_exprt(const exprt &_array, exprt _index) : binary_exprt(_array, ID_index, std::move(_index), _array.type().subtype()) { @@ -1761,11 +1630,6 @@ inline array_list_exprt &to_array_list_expr(exprt &expr) class vector_exprt : public multi_ary_exprt { public: - DEPRECATED(SINCE(2018, 9, 21, "use vector_exprt(type) instead")) - vector_exprt() : multi_ary_exprt(ID_vector) - { - } - DEPRECATED(SINCE(2019, 1, 12, "use vector_exprt(operands, type) instead")) explicit vector_exprt(const vector_typet &_type) : multi_ary_exprt(ID_vector, _type) @@ -1808,19 +1672,6 @@ inline vector_exprt &to_vector_expr(exprt &expr) class union_exprt:public unary_exprt { public: - DEPRECATED( - SINCE(2018, 9, 21, "use union_exprt(component_name, value, type) instead")) - union_exprt():unary_exprt(ID_union) - { - } - - DEPRECATED( - SINCE(2018, 9, 21, "use union_exprt(component_name, value, type) instead")) - explicit union_exprt(const typet &_type): - unary_exprt(ID_union, _type) - { - } - union_exprt(const irep_idt &_component_name, exprt _value, typet _type) : unary_exprt(ID_union, std::move(_value), std::move(_type)) { @@ -1938,17 +1789,6 @@ inline struct_exprt &to_struct_expr(exprt &expr) class complex_exprt:public binary_exprt { public: - DEPRECATED(SINCE(2018, 9, 21, "use complex_exprt(r, i, type) instead")) - complex_exprt():binary_exprt(ID_complex) - { - } - - DEPRECATED(SINCE(2018, 9, 21, "use complex_exprt(r, i, type) instead")) - explicit complex_exprt(const complex_typet &_type): - binary_exprt(ID_complex, _type) - { - } - complex_exprt(exprt _real, exprt _imag, complex_typet _type) : binary_exprt( std::move(_real), @@ -2268,11 +2108,6 @@ inline dynamic_object_exprt &to_dynamic_object_expr(exprt &expr) class typecast_exprt:public unary_exprt { public: - DEPRECATED(SINCE(2018, 9, 21, "use typecast_exprt(op, type) instead")) - explicit typecast_exprt(const typet &_type):unary_exprt(ID_typecast, _type) - { - } - typecast_exprt(exprt op, typet _type) : unary_exprt(ID_typecast, std::move(op), std::move(_type)) { @@ -2327,12 +2162,6 @@ inline typecast_exprt &to_typecast_expr(exprt &expr) class floatbv_typecast_exprt:public binary_exprt { public: - DEPRECATED( - SINCE(2018, 9, 21, "use floatbv_typecast_exprt(op, r, type) instead")) - floatbv_typecast_exprt():binary_exprt(ID_floatbv_typecast) - { - } - floatbv_typecast_exprt(exprt op, exprt rounding, typet _type) : binary_exprt( std::move(op), @@ -2471,11 +2300,6 @@ inline and_exprt &to_and_expr(exprt &expr) class implies_exprt:public binary_exprt { public: - DEPRECATED(SINCE(2018, 9, 21, "use implies_exprt(a, b) instead")) - implies_exprt():binary_exprt(ID_implies, bool_typet()) - { - } - implies_exprt(exprt op0, exprt op1) : binary_exprt(std::move(op0), ID_implies, std::move(op1), bool_typet()) { @@ -2630,11 +2454,6 @@ inline xor_exprt &to_xor_expr(exprt &expr) class bitnot_exprt:public unary_exprt { public: - DEPRECATED(SINCE(2018, 9, 21, "use bitnot_exprt(op) instead")) - bitnot_exprt():unary_exprt(ID_bitnot) - { - } - explicit bitnot_exprt(exprt op) : unary_exprt(ID_bitnot, std::move(op)) { } @@ -2679,11 +2498,6 @@ inline bitnot_exprt &to_bitnot_expr(exprt &expr) class bitor_exprt:public multi_ary_exprt { public: - DEPRECATED(SINCE(2018, 9, 21, "use bitor_exprt(op0, op1) instead")) - bitor_exprt():multi_ary_exprt(ID_bitor) - { - } - bitor_exprt(const exprt &_op0, exprt _op1) : multi_ary_exprt(_op0, ID_bitor, std::move(_op1), _op0.type()) { @@ -2720,11 +2534,6 @@ inline bitor_exprt &to_bitor_expr(exprt &expr) class bitxor_exprt:public multi_ary_exprt { public: - DEPRECATED(SINCE(2018, 9, 21, "use bitxor_exprt(op0, op1) instead")) - bitxor_exprt():multi_ary_exprt(ID_bitxor) - { - } - bitxor_exprt(exprt _op0, exprt _op1) : multi_ary_exprt(std::move(_op0), ID_bitxor, std::move(_op1)) { @@ -2761,11 +2570,6 @@ inline bitxor_exprt &to_bitxor_expr(exprt &expr) class bitand_exprt:public multi_ary_exprt { public: - DEPRECATED(SINCE(2018, 9, 21, "use bitand_exprt(op0, op1) instead")) - bitand_exprt():multi_ary_exprt(ID_bitand) - { - } - bitand_exprt(const exprt &_op0, exprt _op1) : multi_ary_exprt(_op0, ID_bitand, std::move(_op1), _op0.type()) { @@ -2802,17 +2606,6 @@ inline bitand_exprt &to_bitand_expr(exprt &expr) class shift_exprt:public binary_exprt { public: - DEPRECATED(SINCE(2018, 9, 21, "use shift_exprt(value, id, distance) instead")) - explicit shift_exprt(const irep_idt &_id):binary_exprt(_id) - { - } - - DEPRECATED(SINCE(2018, 9, 21, "use shift_exprt(value, id, distance) instead")) - shift_exprt(const irep_idt &_id, const typet &_type): - binary_exprt(_id, _type) - { - } - shift_exprt(exprt _src, const irep_idt &_id, exprt _distance) : binary_exprt(std::move(_src), _id, std::move(_distance)) { @@ -2878,11 +2671,6 @@ inline shift_exprt &to_shift_expr(exprt &expr) class shl_exprt:public shift_exprt { public: - DEPRECATED(SINCE(2018, 9, 21, "use shl_exprt(value, distance) instead")) - shl_exprt():shift_exprt(ID_shl) - { - } - shl_exprt(exprt _src, exprt _distance) : shift_exprt(std::move(_src), ID_shl, std::move(_distance)) { @@ -2921,11 +2709,6 @@ inline shl_exprt &to_shl_expr(exprt &expr) class ashr_exprt:public shift_exprt { public: - DEPRECATED(SINCE(2018, 9, 21, "use ashl_exprt(value, distance) instead")) - ashr_exprt():shift_exprt(ID_ashr) - { - } - ashr_exprt(exprt _src, exprt _distance) : shift_exprt(std::move(_src), ID_ashr, std::move(_distance)) { @@ -2941,11 +2724,6 @@ class ashr_exprt:public shift_exprt class lshr_exprt:public shift_exprt { public: - DEPRECATED(SINCE(2018, 9, 21, "use lshl_exprt(value, distance) instead")) - lshr_exprt():shift_exprt(ID_lshr) - { - } - lshr_exprt(exprt _src, exprt _distance) : shift_exprt(std::move(_src), ID_lshr, std::move(_distance)) { @@ -2961,11 +2739,6 @@ class lshr_exprt:public shift_exprt class extractbit_exprt:public binary_predicate_exprt { public: - DEPRECATED(SINCE(2018, 9, 21, "use extractbit_exprt(value, index) instead")) - extractbit_exprt():binary_predicate_exprt(ID_extractbit) - { - } - /// Extract the \p _index-th least significant bit from \p _src. extractbit_exprt(exprt _src, exprt _index) : binary_predicate_exprt(std::move(_src), ID_extractbit, std::move(_index)) @@ -3034,13 +2807,6 @@ inline extractbit_exprt &to_extractbit_expr(exprt &expr) class extractbits_exprt : public expr_protectedt { public: - DEPRECATED( - SINCE(2018, 9, 21, "use extractbits_exprt(value, upper, lower) instead")) - extractbits_exprt() : expr_protectedt(ID_extractbits, typet()) - { - operands().resize(3); - } - /// Extract the bits [\p _lower .. \p _upper] from \p _src to produce a result /// of type \p _type. Note that this specifies a closed interval, i.e., both /// bits \p _lower and \p _upper are included. Indices count from the @@ -3237,17 +3003,6 @@ inline not_exprt &to_not_expr(exprt &expr) class dereference_exprt:public unary_exprt { public: - DEPRECATED(SINCE(2018, 9, 21, "use dereference_exprt(pointer) instead")) - dereference_exprt():unary_exprt(ID_dereference) - { - } - - DEPRECATED(SINCE(2018, 9, 21, "use dereference_exprt(pointer) instead")) - explicit dereference_exprt(const typet &type): - unary_exprt(ID_dereference, type) - { - } - explicit dereference_exprt(const exprt &op): unary_exprt(ID_dereference, op, op.type().subtype()) { @@ -3339,11 +3094,6 @@ class if_exprt : public ternary_exprt { } - DEPRECATED(SINCE(2018, 9, 21, "use if_exprt(cond, t, f) instead")) - if_exprt() : ternary_exprt(ID_if) - { - } - exprt &cond() { return op0(); @@ -3423,13 +3173,6 @@ class with_exprt : public expr_protectedt { } - DEPRECATED( - SINCE(2018, 9, 21, "use with_exprt(old, where, new_value) instead")) - with_exprt() : expr_protectedt(ID_with, typet()) - { - operands().resize(3); - } - exprt &old() { return op0(); @@ -3616,19 +3359,6 @@ class update_exprt : public ternary_exprt { } - DEPRECATED( - SINCE(2018, 9, 21, "use update_exprt(old, where, new_value) instead")) - explicit update_exprt(const typet &_type) : ternary_exprt(ID_update, _type) - { - } - - DEPRECATED( - SINCE(2018, 9, 21, "use update_exprt(old, where, new_value) instead")) - update_exprt() : ternary_exprt(ID_update) - { - op1().id(ID_designator); - } - exprt &old() { return op0(); @@ -3802,11 +3532,6 @@ class member_exprt:public unary_exprt set_component_name(c.get_name()); } - DEPRECATED(SINCE(2018, 9, 21, "use member_exprt(op, c) instead")) - member_exprt():unary_exprt(ID_member) - { - } - irep_idt get_component_name() const { return get(ID_component_name); @@ -4292,11 +4017,6 @@ inline ieee_float_op_exprt &to_ieee_float_op_expr(exprt &expr) class type_exprt : public nullary_exprt { public: - DEPRECATED(SINCE(2018, 9, 21, "use type_exprt(type) instead")) - type_exprt() : nullary_exprt(ID_type) - { - } - explicit type_exprt(typet type) : nullary_exprt(ID_type, std::move(type)) { } @@ -4306,17 +4026,6 @@ class type_exprt : public nullary_exprt class constant_exprt : public expr_protectedt { public: - DEPRECATED(SINCE(2018, 9, 21, "use constant_exprt(value, type) instead")) - constant_exprt() : expr_protectedt(ID_constant, typet()) - { - } - - DEPRECATED(SINCE(2018, 9, 21, "use constant_exprt(value, type) instead")) - explicit constant_exprt(const typet &type) - : expr_protectedt(ID_constant, type) - { - } - constant_exprt(const irep_idt &_value, typet _type) : expr_protectedt(ID_constant, std::move(_type)) { @@ -4404,17 +4113,6 @@ class null_pointer_exprt:public constant_exprt class replication_exprt : public binary_exprt { public: - DEPRECATED(SINCE(2018, 9, 21, "use replication_exprt(times, value) instead")) - replication_exprt() : binary_exprt(ID_replication) - { - } - - DEPRECATED(SINCE(2018, 9, 21, "use replication_exprt(times, value) instead")) - explicit replication_exprt(const typet &_type) - : binary_exprt(ID_replication, _type) - { - } - replication_exprt(const constant_exprt &_times, const exprt &_src) : binary_exprt(_times, ID_replication, _src) { @@ -4483,17 +4181,6 @@ inline replication_exprt &to_replication_expr(exprt &expr) class concatenation_exprt : public multi_ary_exprt { public: - DEPRECATED(SINCE(2018, 9, 21, "use concatenation_exprt(op, type) instead")) - concatenation_exprt() : multi_ary_exprt(ID_concatenation) - { - } - - DEPRECATED(SINCE(2018, 9, 21, "use concatenation_exprt(op, type) instead")) - explicit concatenation_exprt(const typet &_type) - : multi_ary_exprt(ID_concatenation, _type) - { - } - concatenation_exprt(operandst _operands, typet _type) : multi_ary_exprt(ID_concatenation, std::move(_operands), std::move(_type)) { @@ -4627,11 +4314,6 @@ inline let_exprt &to_let_expr(exprt &expr) class popcount_exprt: public unary_exprt { public: - DEPRECATED(SINCE(2018, 9, 21, "use popcount_exprt(op, type) instead")) - popcount_exprt(): unary_exprt(ID_popcount) - { - } - popcount_exprt(exprt _op, typet _type) : unary_exprt(ID_popcount, std::move(_op), std::move(_type)) {