Skip to content

Avoid sva_sequence_matcht default constructor #1168

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
Jun 25, 2025
Merged

Avoid sva_sequence_matcht default constructor #1168

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
23 changes: 11 additions & 12 deletions src/temporal-logic/sva_sequence_match.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,8 @@ Author: Daniel Kroening, [email protected]

sva_sequence_matcht sva_sequence_matcht::true_match(const mp_integer &n)
{
sva_sequence_matcht result;
for(mp_integer i; i < n; ++i)
result.cond_vector.push_back(true_exprt{});
return result;
auto n_size_t = numeric_cast_v<std::size_t>(n);
return sva_sequence_matcht{std::vector<exprt>(n_size_t, true_exprt{})};
}

// nonoverlapping concatenation
Expand All @@ -32,11 +30,12 @@ sva_sequence_matcht concat(sva_sequence_matcht a, const sva_sequence_matcht &b)
// nonoverlapping concatenation
sva_sequence_matcht repeat(sva_sequence_matcht m, const mp_integer &n)
{
sva_sequence_matcht result;
std::vector<exprt> cond_vector;
cond_vector.reserve(numeric_cast_v<std::size_t>(n * m.length()));
for(mp_integer i = 0; i < n; ++i)
result.cond_vector.insert(
result.cond_vector.end(), m.cond_vector.begin(), m.cond_vector.end());
return result;
cond_vector.insert(
cond_vector.end(), m.cond_vector.begin(), m.cond_vector.end());
return sva_sequence_matcht{std::move(cond_vector)};
}

// overlapping concatenation
Expand Down Expand Up @@ -171,9 +170,9 @@ std::vector<sva_sequence_matcht> LTL_sequence_matches(const exprt &sequence)
for(auto &match_lhs : matches_lhs)
for(auto &match_rhs : matches_rhs)
{
sva_sequence_matcht new_match;
std::vector<exprt> cond_vector;
auto new_length = std::max(match_lhs.length(), match_rhs.length());
new_match.cond_vector.resize(new_length);
cond_vector.resize(new_length);
for(std::size_t i = 0; i < new_length; i++)
{
exprt::operandst conjuncts;
Expand All @@ -183,10 +182,10 @@ std::vector<sva_sequence_matcht> LTL_sequence_matches(const exprt &sequence)
if(i < match_rhs.cond_vector.size())
conjuncts.push_back(match_rhs.cond_vector[i]);

new_match.cond_vector[i] = conjunction(conjuncts);
cond_vector[i] = conjunction(conjuncts);
}

result.push_back(std::move(new_match));
result.emplace_back(std::move(cond_vector));
}

return result;
Expand Down
5 changes: 0 additions & 5 deletions src/temporal-logic/sva_sequence_match.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@ Author: Daniel Kroening, [email protected]
// sequence expressions.
struct sva_sequence_matcht
{
// the empty match
sva_sequence_matcht()
{
}

// a match of length 1
explicit sva_sequence_matcht(exprt __cond) : cond_vector{1, std::move(__cond)}
{
Expand Down
Loading