Skip to content

Commit fc5cf07

Browse files
tautschnigtautschnig
committed
Remove deprecated code_*t and side_effect_expr*t constructors
1 parent a7c8500 commit fc5cf07

File tree

1 file changed

+0
-156
lines changed

1 file changed

+0
-156
lines changed

‎src/util/std_code.h

-156
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,6 @@ Author: Daniel Kroening, [email protected]
3535
class codet:public exprt
3636
{
3737
public:
38-
DEPRECATED("use codet(statement) instead")
39-
codet() : exprt(ID_code, empty_typet())
40-
{
41-
}
42-
4338
/// \param statement: Specifies the type of the `codet` to be constructed,
4439
/// e.g. `ID_block` for a \ref code_blockt or `ID_assign` for a
4540
/// \ref code_assignt.
@@ -496,12 +491,6 @@ inline code_deadt &to_code_dead(codet &code)
496491
class code_assumet:public codet
497492
{
498493
public:
499-
DEPRECATED("use code_assumet(expr) instead")
500-
code_assumet():codet(ID_assume)
501-
{
502-
operands().resize(1);
503-
}
504-
505494
explicit code_assumet(const exprt &expr):codet(ID_assume)
506495
{
507496
add_to_operands(expr);
@@ -548,12 +537,6 @@ inline void validate_expr(const code_assumet &x)
548537
class code_assertt:public codet
549538
{
550539
public:
551-
DEPRECATED("use code_assertt(expr) instead")
552-
code_assertt():codet(ID_assert)
553-
{
554-
operands().resize(1);
555-
}
556-
557540
explicit code_assertt(const exprt &expr):codet(ID_assert)
558541
{
559542
add_to_operands(expr);
@@ -614,14 +597,6 @@ code_blockt create_fatal_assertion(
614597
class code_ifthenelset:public codet
615598
{
616599
public:
617-
DEPRECATED("use code_ifthenelset(condition, then_code[, else_code]) instead")
618-
code_ifthenelset():codet(ID_ifthenelse)
619-
{
620-
operands().resize(3);
621-
op1().make_nil();
622-
op2().make_nil();
623-
}
624-
625600
/// An if \p condition then \p then_code else \p else_code statement.
626601
code_ifthenelset(
627602
const exprt &condition,
@@ -705,12 +680,6 @@ inline code_ifthenelset &to_code_ifthenelse(codet &code)
705680
class code_switcht:public codet
706681
{
707682
public:
708-
DEPRECATED("use code_switcht(value, body) instead")
709-
code_switcht():codet(ID_switch)
710-
{
711-
operands().resize(2);
712-
}
713-
714683
code_switcht(const exprt &_value, const codet &_body) : codet(ID_switch)
715684
{
716685
operands().resize(2);
@@ -767,12 +736,6 @@ inline code_switcht &to_code_switch(codet &code)
767736
class code_whilet:public codet
768737
{
769738
public:
770-
DEPRECATED("use code_whilet(cond, body) instead")
771-
code_whilet():codet(ID_while)
772-
{
773-
operands().resize(2);
774-
}
775-
776739
code_whilet(const exprt &_cond, const codet &_body) : codet(ID_while)
777740
{
778741
operands().resize(2);
@@ -829,12 +792,6 @@ inline code_whilet &to_code_while(codet &code)
829792
class code_dowhilet:public codet
830793
{
831794
public:
832-
DEPRECATED("use code_dowhilet(cond, body) instead")
833-
code_dowhilet():codet(ID_dowhile)
834-
{
835-
operands().resize(2);
836-
}
837-
838795
code_dowhilet(const exprt &_cond, const codet &_body) : codet(ID_dowhile)
839796
{
840797
operands().resize(2);
@@ -893,12 +850,6 @@ inline code_dowhilet &to_code_dowhile(codet &code)
893850
class code_fort:public codet
894851
{
895852
public:
896-
DEPRECATED("use code_fort(init, cond, iter, body) instead")
897-
code_fort():codet(ID_for)
898-
{
899-
operands().resize(4);
900-
}
901-
902853
/// A statement describing a for loop with initializer \p _init, loop
903854
/// condition \p _cond, increment \p _iter, and body \p _body.
904855
code_fort(
@@ -983,11 +934,6 @@ inline code_fort &to_code_for(codet &code)
983934
class code_gotot:public codet
984935
{
985936
public:
986-
DEPRECATED("use code_gotot(label) instead")
987-
code_gotot():codet(ID_goto)
988-
{
989-
}
990-
991937
explicit code_gotot(const irep_idt &label):codet(ID_goto)
992938
{
993939
set_destination(label);
@@ -1036,14 +982,6 @@ inline code_gotot &to_code_goto(codet &code)
1036982
class code_function_callt:public codet
1037983
{
1038984
public:
1039-
DEPRECATED("Use code_function_callt(...) instead")
1040-
code_function_callt():codet(ID_function_call)
1041-
{
1042-
operands().resize(3);
1043-
lhs().make_nil();
1044-
op2().id(ID_arguments);
1045-
}
1046-
1047985
explicit code_function_callt(const exprt &_function) : codet(ID_function_call)
1048986
{
1049987
operands().resize(3);
@@ -1256,12 +1194,6 @@ inline void validate_expr(const code_returnt &x)
12561194
class code_labelt:public codet
12571195
{
12581196
public:
1259-
DEPRECATED("use code_labelt(label) instead")
1260-
code_labelt():codet(ID_label)
1261-
{
1262-
operands().resize(1);
1263-
}
1264-
12651197
explicit code_labelt(const irep_idt &_label):codet(ID_label)
12661198
{
12671199
operands().resize(1);
@@ -1326,12 +1258,6 @@ inline code_labelt &to_code_label(codet &code)
13261258
class code_switch_caset:public codet
13271259
{
13281260
public:
1329-
DEPRECATED("use code_switch_caset(case_op, code) instead")
1330-
code_switch_caset():codet(ID_switch_case)
1331-
{
1332-
operands().resize(2);
1333-
}
1334-
13351261
code_switch_caset(
13361262
const exprt &_case_op, const codet &_code):codet(ID_switch_case)
13371263
{
@@ -1504,12 +1430,6 @@ inline const code_asmt &to_code_asm(const codet &code)
15041430
class code_expressiont:public codet
15051431
{
15061432
public:
1507-
DEPRECATED("use code_expressiont(expr) instead")
1508-
code_expressiont():codet(ID_expression)
1509-
{
1510-
operands().resize(1);
1511-
}
1512-
15131433
explicit code_expressiont(const exprt &expr):codet(ID_expression)
15141434
{
15151435
add_to_operands(expr);
@@ -1560,19 +1480,6 @@ inline const code_expressiont &to_code_expression(const codet &code)
15601480
class side_effect_exprt : public exprt
15611481
{
15621482
public:
1563-
DEPRECATED("use side_effect_exprt(statement, type, loc) instead")
1564-
explicit side_effect_exprt(const irep_idt &statement) : exprt(ID_side_effect)
1565-
{
1566-
set_statement(statement);
1567-
}
1568-
1569-
DEPRECATED("use side_effect_exprt(statement, type, loc) instead")
1570-
side_effect_exprt(const irep_idt &statement, const typet &_type)
1571-
: exprt(ID_side_effect, _type)
1572-
{
1573-
set_statement(statement);
1574-
}
1575-
15761483
side_effect_exprt(
15771484
const irep_idt &statement,
15781485
const typet &_type,
@@ -1646,19 +1553,6 @@ inline const side_effect_exprt &to_side_effect_expr(const exprt &expr)
16461553
class side_effect_expr_nondett:public side_effect_exprt
16471554
{
16481555
public:
1649-
DEPRECATED("use side_effect_expr_nondett(statement, type, loc) instead")
1650-
side_effect_expr_nondett():side_effect_exprt(ID_nondet)
1651-
{
1652-
set_nullable(true);
1653-
}
1654-
1655-
DEPRECATED("use side_effect_expr_nondett(statement, type, loc) instead")
1656-
explicit side_effect_expr_nondett(const typet &_type):
1657-
side_effect_exprt(ID_nondet, _type)
1658-
{
1659-
set_nullable(true);
1660-
}
1661-
16621556
side_effect_expr_nondett(const typet &_type, const source_locationt &loc)
16631557
: side_effect_exprt(ID_nondet, _type, loc)
16641558
{
@@ -1784,45 +1678,6 @@ to_side_effect_expr_assign(const exprt &expr)
17841678
class side_effect_expr_function_callt:public side_effect_exprt
17851679
{
17861680
public:
1787-
DEPRECATED(
1788-
"use side_effect_expr_function_callt("
1789-
"function, arguments, type, loc) instead")
1790-
side_effect_expr_function_callt()
1791-
: side_effect_exprt(ID_function_call, typet(), source_locationt())
1792-
{
1793-
operands().resize(2);
1794-
op1().id(ID_arguments);
1795-
}
1796-
1797-
DEPRECATED(
1798-
"use side_effect_expr_function_callt("
1799-
"function, arguments, type, loc) instead")
1800-
side_effect_expr_function_callt(
1801-
const exprt &_function,
1802-
const exprt::operandst &_arguments)
1803-
: side_effect_exprt(ID_function_call)
1804-
{
1805-
operands().resize(2);
1806-
op1().id(ID_arguments);
1807-
function() = _function;
1808-
arguments() = _arguments;
1809-
}
1810-
1811-
DEPRECATED(
1812-
"use side_effect_expr_function_callt("
1813-
"function, arguments, type, loc) instead")
1814-
side_effect_expr_function_callt(
1815-
const exprt &_function,
1816-
const exprt::operandst &_arguments,
1817-
const typet &_type)
1818-
: side_effect_exprt(ID_function_call, _type)
1819-
{
1820-
operands().resize(2);
1821-
op1().id(ID_arguments);
1822-
function() = _function;
1823-
arguments() = _arguments;
1824-
}
1825-
18261681
side_effect_expr_function_callt(
18271682
const exprt &_function,
18281683
const exprt::operandst &_arguments,
@@ -1888,11 +1743,6 @@ inline const side_effect_expr_function_callt
18881743
class side_effect_expr_throwt:public side_effect_exprt
18891744
{
18901745
public:
1891-
DEPRECATED("use side_effect_expr_throwt(exception_list) instead")
1892-
side_effect_expr_throwt():side_effect_exprt(ID_throw)
1893-
{
1894-
}
1895-
18961746
side_effect_expr_throwt(
18971747
const irept &exception_list,
18981748
const typet &type,
@@ -2103,12 +1953,6 @@ static inline const code_landingpadt &to_code_landingpad(const codet &code)
21031953
class code_try_catcht:public codet
21041954
{
21051955
public:
2106-
DEPRECATED("use code_try_catcht(try_code) instead")
2107-
code_try_catcht():codet(ID_try_catch)
2108-
{
2109-
operands().resize(1);
2110-
}
2111-
21121956
/// A statement representing try \p _try_code catch ...
21131957
explicit code_try_catcht(const codet &_try_code) : codet(ID_try_catch)
21141958
{

0 commit comments

Comments
 (0)