Skip to content

Remove deprecated add_axioms_from_bool method #8919

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

Draft
tautschnig wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

Remove deprecated add_axioms_from_bool method #8919

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
2 changes: 0 additions & 2 deletions src/solvers/strings/string_constraint_generator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,6 @@ class string_constraint_generatort final
std::pair<exprt, string_constraintst>
add_axioms_from_bool(const function_application_exprt &f);
std::pair<exprt, string_constraintst>
add_axioms_from_bool(const array_string_exprt &res, const exprt &b);
std::pair<exprt, string_constraintst>
add_axioms_from_char(const function_application_exprt &f);
std::pair<exprt, string_constraintst>
add_axioms_from_char(const array_string_exprt &res, const exprt &c);
Expand Down
51 changes: 0 additions & 51 deletions src/solvers/strings/string_constraint_generator_valueof.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,57 +54,6 @@ string_constraint_generatort::add_axioms_from_long(
return add_axioms_for_string_of_int(res, f.arguments()[2], 0);
}

/// Add axioms stating that the returned string equals "true" when the Boolean
/// expression is true and "false" when it is false.
/// \deprecated This is Java specific and should be implemented in Java instead
/// \param res: string expression for the result
/// \param b: Boolean expression
/// \return code 0 on success
DEPRECATED(SINCE(2017, 10, 5, "Java specific, should be implemented in Java"))
std::pair<exprt, string_constraintst>
string_constraint_generatort::add_axioms_from_bool(
const array_string_exprt &res,
const exprt &b)
{
const typet &char_type = to_type_with_subtype(res.content().type()).subtype();
PRECONDITION(b.type() == bool_typet() || b.type().id() == ID_c_bool);
string_constraintst constraints;
typecast_exprt eq(b, bool_typet());

// We add axioms:
// a1 : eq => res = |"true"|
// a2 : forall i < |"true"|. eq => res[i]="true"[i]
// a3 : !eq => res = |"false"|
// a4 : forall i < |"false"|. !eq => res[i]="false"[i]

std::string str_true = "true";
const implies_exprt a1(
eq, equal_to(array_pool.get_or_create_length(res), str_true.length()));
constraints.existential.push_back(a1);

for(std::size_t i = 0; i < str_true.length(); i++)
{
exprt chr = from_integer(str_true[i], char_type);
implies_exprt a2(eq, equal_exprt(res[i], chr));
constraints.existential.push_back(a2);
}

std::string str_false = "false";
const implies_exprt a3(
not_exprt(eq),
equal_to(array_pool.get_or_create_length(res), str_false.length()));
constraints.existential.push_back(a3);

for(std::size_t i = 0; i < str_false.length(); i++)
{
exprt chr = from_integer(str_false[i], char_type);
implies_exprt a4(not_exprt(eq), equal_exprt(res[i], chr));
constraints.existential.push_back(a4);
}

return {from_integer(0, get_return_code_type()), std::move(constraints)};
}

/// Add axioms enforcing that the string corresponds to the result
/// of String.valueOf(I) or String.valueOf(J) Java functions applied
/// on the integer expression.
Expand Down
45 changes: 42 additions & 3 deletions src/solvers/strings/string_format_builtin_function.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,9 +172,48 @@ add_axioms_for_format_specifier(
return {res, constraints};
}
case format_specifiert::BOOLEAN:
return_code = generator.add_axioms_from_bool(
res, format_arg_from_string(string_arg, ID_boolean, array_pool));
return {res, std::move(return_code.second)};
{
// Inlined from deprecated add_axioms_from_bool
// Add axioms stating that the returned string equals "true" when the
// Boolean expression is true and "false" when it is false.
const exprt b = format_arg_from_string(string_arg, ID_boolean, array_pool);
const typet &char_type =
to_type_with_subtype(res.content().type()).subtype();
typecast_exprt eq(b, bool_typet());

// We add axioms:
// a1 : eq => res = |"true"|
// a2 : forall i < |"true"|. eq => res[i]="true"[i]
// a3 : !eq => res = |"false"|
// a4 : forall i < |"false"|. !eq => res[i]="false"[i]

std::string str_true = "true";
const implies_exprt a1(
eq, equal_to(array_pool.get_or_create_length(res), str_true.length()));
constraints.existential.push_back(a1);

for(std::size_t i = 0; i < str_true.length(); i++)
{
exprt chr = from_integer(str_true[i], char_type);
implies_exprt a2(eq, equal_exprt(res[i], chr));
constraints.existential.push_back(a2);
}

std::string str_false = "false";
const implies_exprt a3(
not_exprt(eq),
equal_to(array_pool.get_or_create_length(res), str_false.length()));
constraints.existential.push_back(a3);

for(std::size_t i = 0; i < str_false.length(); i++)
{
exprt chr = from_integer(str_false[i], char_type);
implies_exprt a4(not_exprt(eq), equal_exprt(res[i], chr));
constraints.existential.push_back(a4);
}

return {res, constraints};
}
case format_specifiert::STRING:
{
const exprt arg_string = string_arg;
Expand Down
Loading