Skip to content

split_string cleanup #2843

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 2 commits into from
Aug 27, 2018
Merged

split_string cleanup #2843

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0881bf2
split_string with return value now also has 'strip' and 'remove_empty'
Aug 26, 2018
646a9d8
use split_string that returns its result
Aug 26, 2018
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
4 changes: 2 additions & 2 deletions src/goto-instrument/unwindset.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ void unwindsett::parse_unwind(const std::string &unwind)

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

for(auto &val : unwindset_loops)
{
Expand Down
4 changes: 2 additions & 2 deletions src/util/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1301,8 +1301,8 @@ void configt::set_classpath(const std::string &cp)
const char cp_separator = ':';
#endif

std::vector<std::string> class_path;
split_string(cp, cp_separator, class_path);
std::vector<std::string> class_path =
split_string(cp, cp_separator);
java.classpath.insert(
java.classpath.end(), class_path.begin(), class_path.end());
}
Expand Down
8 changes: 6 additions & 2 deletions src/util/string_utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,10 +116,14 @@ void split_string(
right=result[1];
}

std::vector<std::string> split_string(const std::string &s, char delim)
std::vector<std::string> split_string(
const std::string &s,
char delim,
bool strip,
bool remove_empty)
{
std::vector<std::string> result;
split_string(s, delim, result);
split_string(s, delim, result, strip, remove_empty);
return result;
}

Expand Down
6 changes: 5 additions & 1 deletion src/util/string_utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,11 @@ void split_string(
std::string &right,
bool strip=false);

std::vector<std::string> split_string(const std::string &s, char delim);
std::vector<std::string> split_string(
const std::string &s,
char delim,
bool strip = false,
bool remove_empty = false);

std::string trim_from_last_delimiter(
const std::string &s,
Expand Down
4 changes: 2 additions & 2 deletions src/util/unwrap_nested_exception.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ Author: Diffblue Ltd.
std::string unwrap_exception(const std::exception &e, int level)
{
const std::string msg = e.what();
std::vector<std::string> lines;
split_string(msg, '\n', lines, false, true);
std::vector<std::string> lines =
split_string(msg, '\n', false, true);
std::ostringstream message_stream;
message_stream << std::string(level, ' ') << "exception: ";
join_strings(
Expand Down
24 changes: 12 additions & 12 deletions unit/util/string_utils/split_string.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ void run_on_all_variants(
{
WHEN("Not stripping, not removing empty")
{
std::vector<std::string> result;
split_string(string, delimiter, result, false, false);
std::vector<std::string> result =
split_string(string, delimiter, false, false);

THEN("Should get expected vector")
{
Expand All @@ -44,8 +44,8 @@ void run_on_all_variants(
}
WHEN("Not stripping, removing empty")
{
std::vector<std::string> result;
split_string(string, delimiter, result, false, true);
std::vector<std::string> result =
split_string(string, delimiter, false, true);

THEN("Should get expected vector")
{
Expand All @@ -58,8 +58,8 @@ void run_on_all_variants(
}
WHEN("Stripping, not removing empty")
{
std::vector<std::string> result;
split_string(string, delimiter, result, true, false);
std::vector<std::string> result =
split_string(string, delimiter, true, false);

THEN("Should get expected vector")
{
Expand All @@ -72,8 +72,8 @@ void run_on_all_variants(
}
WHEN("Stripping and removing empty")
{
std::vector<std::string> result;
split_string(string, delimiter, result, true, true);
std::vector<std::string> result =
split_string(string, delimiter, true, true);

THEN("Should get expected vector")
{
Expand Down Expand Up @@ -141,8 +141,8 @@ SCENARIO("split_string", "[core][utils][string_utils][split_string]")

WHEN("Not stripping, not removing empty")
{
std::vector<std::string> result;
split_string(string, delimiter, result, false, false);
std::vector<std::string> result =
split_string(string, delimiter, false, false);

THEN("Should get expected vector")
{
Expand All @@ -154,8 +154,8 @@ SCENARIO("split_string", "[core][utils][string_utils][split_string]")
}
WHEN("Not stripping, removing empty")
{
std::vector<std::string> result;
split_string(string, delimiter, result, false, true);
std::vector<std::string> result =
split_string(string, delimiter, false, true);

THEN("Should get expected vector")
{
Expand Down