ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add utils::split_lines

Browse Source
This commit is contained in:
Richard Berger
2021-03-24 15:53:00 -04:00
parent 1c9c46d2c1
commit b15502ddc8
3 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/utils.cpp
View File

@ -851,6 +851,14 @@ std::vector<std::string> utils::split_words(const std::string &text)
return list; return list;
} }
/* ----------------------------------------------------------------------
Convert multi-line string into lines
------------------------------------------------------------------------- */
std::vector<std::string> utils::split_lines(const std::string &text)
{
return Tokenizer(text, "\n").as_vector();
}
/* ---------------------------------------------------------------------- /* ----------------------------------------------------------------------
Return whether string is a valid integer number Return whether string is a valid integer number
------------------------------------------------------------------------- */ ------------------------------------------------------------------------- */

6
src/utils.h
View File

@ -321,6 +321,12 @@ namespace LAMMPS_NS {
std::vector<std::string> split_words(const std::string &text); std::vector<std::string> split_words(const std::string &text);
/** Take multi-line text and split into lines
*
* \param text string that should be split
* \return STL vector with the lines */
std::vector<std::string> split_lines(const std::string &text);
/** Check if string can be converted to valid integer /** Check if string can be converted to valid integer
* *
* \param str string that should be checked * \param str string that should be checked

17
unittest/utils/test_utils.cpp
View File

@ -113,7 +113,7 @@ TEST(Utils, count_words_with_extra_spaces)
TEST(Utils, split_words_simple) TEST(Utils, split_words_simple)
{ {
std::vector<std::string> list = utils::split_words("one two three"); auto list = utils::split_words("one two three");
ASSERT_EQ(list.size(), 3); ASSERT_EQ(list.size(), 3);
ASSERT_THAT(list[0], StrEq("one")); ASSERT_THAT(list[0], StrEq("one"));
ASSERT_THAT(list[1], StrEq("two")); ASSERT_THAT(list[1], StrEq("two"));
@ -122,7 +122,7 @@ TEST(Utils, split_words_simple)
TEST(Utils, split_words_quoted) TEST(Utils, split_words_quoted)
{ {
std::vector<std::string> list = utils::split_words("one 'two' \"three\""); auto list = utils::split_words("one 'two' \"three\"");
ASSERT_EQ(list.size(), 3); ASSERT_EQ(list.size(), 3);
ASSERT_THAT(list[0], StrEq("one")); ASSERT_THAT(list[0], StrEq("one"));
ASSERT_THAT(list[1], StrEq("two")); ASSERT_THAT(list[1], StrEq("two"));
@ -131,7 +131,7 @@ TEST(Utils, split_words_quoted)
TEST(Utils, split_words_escaped) TEST(Utils, split_words_escaped)
{ {
std::vector<std::string> list = utils::split_words("1\\' '\"two\"' 3\\\""); auto list = utils::split_words("1\\' '\"two\"' 3\\\"");
ASSERT_EQ(list.size(), 3); ASSERT_EQ(list.size(), 3);
ASSERT_THAT(list[0], StrEq("1\\'")); ASSERT_THAT(list[0], StrEq("1\\'"));
ASSERT_THAT(list[1], StrEq("\"two\"")); ASSERT_THAT(list[1], StrEq("\"two\""));
@ -140,13 +140,22 @@ TEST(Utils, split_words_escaped)
TEST(Utils, split_words_quote_in_quoted) TEST(Utils, split_words_quote_in_quoted)
{ {
std::vector<std::string> list = utils::split_words("one 't\\'wo' \"th\\\"ree\""); auto list = utils::split_words("one 't\\'wo' \"th\\\"ree\"");
ASSERT_EQ(list.size(), 3); ASSERT_EQ(list.size(), 3);
ASSERT_THAT(list[0], StrEq("one")); ASSERT_THAT(list[0], StrEq("one"));
ASSERT_THAT(list[1], StrEq("t\\'wo")); ASSERT_THAT(list[1], StrEq("t\\'wo"));
ASSERT_THAT(list[2], StrEq("th\\\"ree")); ASSERT_THAT(list[2], StrEq("th\\\"ree"));
} }
TEST(Utils, split_lines)
{
auto list = utils::split_lines(" line 1\nline 2 \n line 3 \n");
ASSERT_EQ(list.size(), 3);
ASSERT_THAT(list[0], StrEq(" line 1"));
ASSERT_THAT(list[1], StrEq("line 2 "));
ASSERT_THAT(list[2], StrEq(" line 3 "));
}
TEST(Utils, valid_integer1) TEST(Utils, valid_integer1)
{ {
ASSERT_TRUE(utils::is_integer("10")); ASSERT_TRUE(utils::is_integer("10"));