Skip to content

Commit d7b937a

Browse files
committed
Use std::optional in smt2_incremental_decision_proceduret
1 parent d8c60c9 commit d7b937a

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

src/solvers/smt2_incremental/smt2_incremental_decision_procedure.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ static smt_responset get_response_to_command(
4444

4545
/// Returns a message string describing the problem in the case where the
4646
/// response from the solver is an error status. Returns empty otherwise.
47-
static optionalt<std::string>
47+
static std::optional<std::string>
4848
get_problem_messages(const smt_responset &response)
4949
{
5050
if(const auto error = response.cast<smt_error_responset>())
@@ -413,7 +413,7 @@ exprt smt2_incremental_decision_proceduret::handle(const exprt &expr)
413413
return expr;
414414
}
415415

416-
optionalt<smt_termt>
416+
std::optional<smt_termt>
417417
smt2_incremental_decision_proceduret::get_identifier(const exprt &expr) const
418418
{
419419
// Lookup the non-lowered form first.
@@ -437,7 +437,7 @@ smt2_incremental_decision_proceduret::get_identifier(const exprt &expr) const
437437
return {};
438438
}
439439

440-
optionalt<exprt> smt2_incremental_decision_proceduret::get_expr(
440+
std::optional<exprt> smt2_incremental_decision_proceduret::get_expr(
441441
const smt_termt &array,
442442
const array_typet &type) const
443443
{
@@ -467,7 +467,7 @@ optionalt<exprt> smt2_incremental_decision_proceduret::get_expr(
467467
return array_exprt{elements, type};
468468
}
469469

470-
optionalt<exprt> smt2_incremental_decision_proceduret::get_expr(
470+
std::optional<exprt> smt2_incremental_decision_proceduret::get_expr(
471471
const smt_termt &struct_term,
472472
const struct_tag_typet &type) const
473473
{
@@ -478,7 +478,7 @@ optionalt<exprt> smt2_incremental_decision_proceduret::get_expr(
478478
return {struct_encoding.decode(*encoded_result, type)};
479479
}
480480

481-
optionalt<exprt> smt2_incremental_decision_proceduret::get_expr(
481+
std::optional<exprt> smt2_incremental_decision_proceduret::get_expr(
482482
const smt_termt &union_term,
483483
const union_tag_typet &type) const
484484
{
@@ -489,7 +489,7 @@ optionalt<exprt> smt2_incremental_decision_proceduret::get_expr(
489489
return {struct_encoding.decode(*encoded_result, type)};
490490
}
491491

492-
optionalt<exprt> smt2_incremental_decision_proceduret::get_expr(
492+
std::optional<exprt> smt2_incremental_decision_proceduret::get_expr(
493493
const smt_termt &descriptor,
494494
const typet &type) const
495495
{
@@ -556,7 +556,7 @@ exprt smt2_incremental_decision_proceduret::get(const exprt &expr) const
556556
log.conditional_output(log.debug(), [&](messaget::mstreamt &debug) {
557557
debug << "`get` - \n " + expr.pretty(2, 0) << messaget::eom;
558558
});
559-
auto descriptor = [&]() -> optionalt<smt_termt> {
559+
auto descriptor = [&]() -> std::optional<smt_termt> {
560560
if(const auto index_expr = expr_try_dynamic_cast<index_exprt>(expr))
561561
{
562562
const auto array = get_identifier(index_expr->array());

src/solvers/smt2_incremental/smt2_incremental_decision_procedure.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@ class smt2_incremental_decision_proceduret final
5656
/// Gets the value of \p descriptor from the solver and returns the solver
5757
/// response expressed as an exprt of type \p type. This is an implementation
5858
/// detail of the `get(exprt)` member function.
59-
optionalt<exprt>
59+
std::optional<exprt>
6060
get_expr(const smt_termt &descriptor, const typet &type) const;
61-
optionalt<exprt>
61+
std::optional<exprt>
6262
get_expr(const smt_termt &struct_term, const struct_tag_typet &type) const;
63-
optionalt<exprt>
63+
std::optional<exprt>
6464
get_expr(const smt_termt &union_term, const union_tag_typet &type) const;
65-
optionalt<exprt>
65+
std::optional<exprt>
6666
get_expr(const smt_termt &array, const array_typet &type) const;
6767

6868
protected:
@@ -117,7 +117,7 @@ class smt2_incremental_decision_proceduret final
117117
/// possible expression forms by expressing these in terms of the remaining
118118
/// language features.
119119
exprt lower(exprt expression) const;
120-
optionalt<smt_termt> get_identifier(const exprt &expr) const;
120+
std::optional<smt_termt> get_identifier(const exprt &expr) const;
121121

122122
/// Namespace for looking up the expressions which symbol_exprts relate to.
123123
/// This includes the symbols defined outside of the decision procedure but

0 commit comments

Comments
 (0)