Skip to content

utils.h: added helpers for efficient string concatination #8344

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
firewave wants to merge 1 commit into
base: main
Choose a base branch
from
+220 −3
Draft

utils.h: added helpers for efficient string concatination #8344

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
5 changes: 2 additions & 3 deletions lib/tokenize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2418,8 +2418,7 @@ namespace {
while (scope && scope->parent) {
if (scope->name.empty())
break;
fullName.insert(0, " :: ");
fullName.insert(0, scope->name);
utils::string::prepend(fullName, scope->name, " :: ");
scope = scope->parent;
}
}
Expand Down Expand Up @@ -2588,7 +2587,7 @@ namespace {
}
// inline member function
else if ((scopeInfo->type == ScopeInfo3::Record || scopeInfo->type == ScopeInfo3::Namespace) && tok1 && Token::Match(tok1->tokAt(-1), "%name% (")) {
std::string scope = scopeInfo->name + "::" + tok1->strAt(-1);
std::string scope = utils::string::create(scopeInfo->name, "::", tok1->strAt(-1));
scopeInfo = scopeInfo->addChild(ScopeInfo3::MemberFunction, std::move(scope), tok, tok->link());
added = true;
}
Expand Down
67 changes: 67 additions & 0 deletions lib/utils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,73 @@ namespace utils {
return result;
};
}

namespace string
{
template<size_t size>
void concat(std::string &str, const char (&data)[size])
{
str.append(data, size-1);
}

inline void concat(std::string &str, char c)
{
str.append(1, c);
}

template<typename T>
void concat(std::string &str, T&& t)
{
str.append(t);
}

template<typename T, typename... Args>
void concat(std::string& str, T&& t, Args&&... args)
{
concat(str, t);
concat(str, args...);
}

template<typename... Args>
std::string create(char c, const Args&... args)
{
std::string str(1, c);
concat(str, args...);
return str;
}

template<typename T, typename... Args>
std::string create(const T& t, const Args&... args)
{
std::string str(t);
concat(str, args...);
return str;
}

template<size_t size>
void prepend(std::string &str, const char (&data)[size])
{
str.insert(0, data, size-1);
}

inline void prepend(std::string &str, char c)
{
str.insert(0, 1, c);
}

template<typename T>
void prepend(std::string &str, T&& t)
{
str.insert(0, t);
}

template<typename T, typename... Args>
void prepend(std::string& str, T&& t, Args&&... args)
{
prepend(str, args...);
prepend(str, t);
}
}
}

#endif
151 changes: 151 additions & 0 deletions test/testutils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ class TestUtils : public TestFixture {
TEST_CASE(as_const);
TEST_CASE(memoize);
TEST_CASE(endsWith);
TEST_CASE(stringConcat);
TEST_CASE(stringCreate);
TEST_CASE(stringPrepend);
}

void isValidGlobPattern() const {
Expand Down Expand Up @@ -575,6 +578,154 @@ class TestUtils : public TestFixture {
ASSERT(!::endsWith("tes", "test"));
ASSERT(!::endsWith("2test", "2"));
}

void stringConcat() const
{
{
std::string s = "0";
utils::string::concat(s, "a");
utils::string::concat(s, "b");
utils::string::concat(s, "c");
ASSERT_EQUALS("0abc", s);
}
{
std::string s = "0";
utils::string::concat(s, "a", "b", "c");
ASSERT_EQUALS("0abc", s);
}
{
const std::string a_str = "a";
const std::string b_str = "b";
const std::string c_str = "c";
{
std::string s = "0";
utils::string::concat(s, a_str);
utils::string::concat(s, b_str);
utils::string::concat(s, c_str);
ASSERT_EQUALS("0abc", s);
}
{
std::string s = "0";
utils::string::concat(s, a_str, b_str, c_str);
ASSERT_EQUALS("0abc", s);
}
}
{
std::string s = "0";
utils::string::concat(s, 'a');
utils::string::concat(s, 'b');
utils::string::concat(s, 'c');
ASSERT_EQUALS("0abc", s);
}
{
std::string s = "0";
utils::string::concat(s, 'a', 'b', 'c');
ASSERT_EQUALS("0abc", s);
}
{
const std::string a_str = "a";
{
std::string s = "0";
utils::string::concat(s, a_str);
utils::string::concat(s, 'b');
utils::string::concat(s, "c");
ASSERT_EQUALS("0abc", s);
}
{
std::string s = "0";
utils::string::concat(s, a_str, 'b', "c");
ASSERT_EQUALS("0abc", s);
}
}
}

void stringCreate() const
{
{
std::string s = utils::string::create("a", "b", "c");
ASSERT_EQUALS("abc", s);
}
{
const std::string a_str = "a";
const std::string b_str = "b";
const std::string c_str = "c";
{
std::string s = utils::string::create(a_str, b_str, c_str);
ASSERT_EQUALS("abc", s);
}
}
{
std::string s = utils::string::create('a', 'b', 'c');
ASSERT_EQUALS("abc", s);
}
{
const std::string a_str = "a";
{
std::string s = utils::string::create(a_str, 'b', "c");
ASSERT_EQUALS("abc", s);
}
}
}

void stringPrepend() const
{
{
std::string s = "0";
utils::string::prepend(s, "a");
utils::string::prepend(s, "b");
utils::string::prepend(s, "c");
ASSERT_EQUALS("cba0", s);
}
{
std::string s = "0";
utils::string::prepend(s, "a", "b", "c");
ASSERT_EQUALS("abc0", s);
}
{
const std::string a_str = "a";
const std::string b_str = "b";
const std::string c_str = "c";
{
std::string s = "0";
utils::string::prepend(s, a_str);
utils::string::prepend(s, b_str);
utils::string::prepend(s, c_str);
ASSERT_EQUALS("cba0", s);
}
{
std::string s = "0";
utils::string::prepend(s, a_str, b_str, c_str);
ASSERT_EQUALS("abc0", s);
}
}
{
std::string s = "0";
utils::string::prepend(s, 'a');
utils::string::prepend(s, 'b');
utils::string::prepend(s, 'c');
ASSERT_EQUALS("cba0", s);
}
{
std::string s = "0";
utils::string::prepend(s, 'a', 'b', 'c');
ASSERT_EQUALS("abc0", s);
}
{
const std::string a_str = "a";
{
std::string s = "0";
utils::string::prepend(s, a_str);
utils::string::prepend(s, 'b');
utils::string::prepend(s, "c");
ASSERT_EQUALS("cba0", s);
}
{
std::string s = "0";
utils::string::prepend(s, a_str, 'b', "c");
ASSERT_EQUALS("abc0", s);
}
}
}
};

REGISTER_TEST(TestUtils)