Skip to content

Remove deprecated variant of parse_unwindset #5565

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
Nov 12, 2020
Merged

Remove deprecated variant of parse_unwindset #5565

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
24 changes: 13 additions & 11 deletions src/goto-instrument/unwindset.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,19 +54,16 @@ void unwindsett::parse_unwindset_one_loop(std::string val)
}
}

void unwindsett::parse_unwindset(const std::string &unwindset)
{
std::vector<std::string> unwindset_elements =
split_string(unwindset, ',', true, true);

for(auto &element : unwindset_elements)
parse_unwindset_one_loop(element);
}

void unwindsett::parse_unwindset(const std::list<std::string> &unwindset)
{
for(auto &element : unwindset)
parse_unwindset(element);
{
std::vector<std::string> unwindset_elements =
split_string(element, ',', true, true);

for(auto &element : unwindset_elements)
parse_unwindset_one_loop(element);
}
}

optionalt<unsigned>
Expand Down Expand Up @@ -104,5 +101,10 @@ void unwindsett::parse_unwindset_file(const std::string &file_name)

std::stringstream buffer;
buffer << file.rdbuf();
parse_unwindset(buffer.str());

std::vector<std::string> unwindset_elements =
split_string(buffer.str(), ',', true, true);

for(auto &element : unwindset_elements)
parse_unwindset_one_loop(element);
}
5 changes: 0 additions & 5 deletions src/goto-instrument/unwindset.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ Author: Daniel Kroening, [email protected]
#include <map>
#include <string>

#include <util/deprecate.h>
#include <util/irep.h>
#include <util/optional.h>

Expand All @@ -32,10 +31,6 @@ class unwindsett
// global limit for all loops
void parse_unwind(const std::string &unwind);

// limit for instances of a loop
DEPRECATED(SINCE(2019, 11, 15, "use parse_unwindset(list) instead"))
void parse_unwindset(const std::string &unwindset);

// limit for instances of a loop
void parse_unwindset(const std::list<std::string> &unwindset);

Expand Down