Skip to content

Add conversion of incremental smt2 data structures to string #6240

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
thomasspriggs merged 9 commits into from
Jul 23, 2021
Merged

Add conversion of incremental smt2 data structures to string #6240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5558cee
Add check on the number of bits in bit vector sorts
thomasspriggs Jul 20, 2021
9f256ca
Add conversion of `smt_sortt` into strings
thomasspriggs Jun 16, 2021
7ca5546
Add conversion of `smt_termt` to strings
thomasspriggs Jul 12, 2021
27cba98
Make identifier of define function command an identifier_term
thomasspriggs Jul 20, 2021
4703215
Add conversion of `smt_commandt` to strings
thomasspriggs Jul 7, 2021
aacc171
Use capture by value in term to string conversion
thomasspriggs Jul 22, 2021
14bfc68
Rename `smt_to_string` as `smt_to_smt2_string`
thomasspriggs Jul 23, 2021
9eee2a7
Rename files from `smt_to_string` to `smt_to_smt2_string`
thomasspriggs Jul 23, 2021
5dd2519
Extend doxygen to specify the targeted format standard
thomasspriggs Jul 23, 2021
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
1 change: 1 addition & 0 deletions src/solvers/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@ SRC = $(BOOLEFORCE_SRC) \
smt2_incremental/smt_options.cpp \
smt2_incremental/smt_sorts.cpp \
smt2_incremental/smt_terms.cpp \
smt2_incremental/smt_to_smt2_string.cpp \
smt2_incremental/smt2_incremental_decision_procedure.cpp \
# Empty last line

Expand Down
9 changes: 6 additions & 3 deletions src/solvers/smt2_incremental/smt_commands.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,9 @@ smt_define_function_commandt::smt_define_function_commandt(
smt_termt definition)
: smt_commandt{ID_smt_define_function_command}
{
set(ID_identifier, identifier);
set(
ID_identifier,
upcast(smt_identifier_termt{std::move(identifier), definition.get_sort()}));
std::transform(
std::make_move_iterator(parameters.begin()),
std::make_move_iterator(parameters.end()),
Expand All @@ -94,9 +96,10 @@ smt_define_function_commandt::smt_define_function_commandt(
set(ID_code, upcast(std::move(definition)));
}

const irep_idt &smt_define_function_commandt::identifier() const
const smt_identifier_termt &smt_define_function_commandt::identifier() const
{
return get(ID_identifier);
return static_cast<const smt_identifier_termt &>(
downcast(find(ID_identifier)));
}

std::vector<std::reference_wrapper<const smt_identifier_termt>>
Expand Down
2 changes: 1 addition & 1 deletion src/solvers/smt2_incremental/smt_commands.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ class smt_define_function_commandt
irep_idt identifier,
std::vector<smt_identifier_termt> parameters,
smt_termt definition);
const irep_idt &identifier() const;
const smt_identifier_termt &identifier() const;
std::vector<std::reference_wrapper<const smt_identifier_termt>>
parameters() const;
const smt_sortt &return_sort() const;
Expand Down
4 changes: 4 additions & 0 deletions src/solvers/smt2_incremental/smt_sorts.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ smt_bool_sortt::smt_bool_sortt() : smt_sortt{ID_smt_bool_sort}
smt_bit_vector_sortt::smt_bit_vector_sortt(const std::size_t bit_width)
: smt_sortt{ID_smt_bit_vector_sort}
{
INVARIANT(
bit_width > 0,
"The definition of SMT2 bit vector theory requires the number of "
"bits to be greater than 0.");
set_size_t(ID_width, bit_width);
}

Expand Down
Loading