Skip to content

Add missing member initializers of string_constraintst-typed value [blocks: #2310] #3366

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 19, 2018
Merged

Add missing member initializers of string_constraintst-typed value [blocks: #2310] #3366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/solvers/refinement/string_constraint_generator_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,8 +571,9 @@ std::pair<exprt, string_constraintst> add_axioms_for_char_at(
PRECONDITION(f.arguments().size() == 2);
array_string_exprt str = get_string_expr(array_pool, f.arguments()[0]);
symbol_exprt char_sym = fresh_symbol("char", str.type().subtype());
const exprt constraint = equal_exprt(char_sym, str[f.arguments()[1]]);
return {char_sym, {{constraint}}};
string_constraintst constraints;
constraints.existential = {equal_exprt(char_sym, str[f.arguments()[1]])};
return {std::move(char_sym), std::move(constraints)};
}

exprt minimum(const exprt &a, const exprt &b)
Expand Down
8 changes: 4 additions & 4 deletions src/solvers/refinement/string_constraint_generator_testing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,10 +136,10 @@ std::pair<exprt, string_constraintst> add_axioms_for_is_empty(

symbol_exprt is_empty = fresh_symbol("is_empty");
array_string_exprt s0 = get_string_expr(array_pool, f.arguments()[0]);
std::vector<exprt> constraints;
constraints.push_back(implies_exprt(is_empty, length_eq(s0, 0)));
constraints.push_back(implies_exprt(length_eq(s0, 0), is_empty));
return {typecast_exprt(is_empty, f.type()), {constraints}};
string_constraintst constraints;
constraints.existential = {implies_exprt(is_empty, length_eq(s0, 0)),
implies_exprt(length_eq(s0, 0), is_empty)};
return {typecast_exprt(is_empty, f.type()), std::move(constraints)};
}

/// Test if the target is a suffix of the string
Expand Down
6 changes: 4 additions & 2 deletions src/solvers/refinement/string_constraint_generator_valueof.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,8 +312,10 @@ std::pair<exprt, string_constraintst> add_axioms_from_char(
const array_string_exprt &res,
const exprt &c)
{
const and_exprt lemma(equal_exprt(res[0], c), length_eq(res, 1));
return {from_integer(0, get_return_code_type()), {{lemma}}};
string_constraintst constraints;
constraints.existential = {
and_exprt(equal_exprt(res[0], c), length_eq(res, 1))};
return {from_integer(0, get_return_code_type()), std::move(constraints)};
}

/// Add axioms making the return value true if the given string is a correct
Expand Down