Skip to content

Adds multilines array support #528

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
Oct 28, 2020
Merged

Adds multilines array support #528

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
34d2b09
Adds multilines array support
Oct 22, 2020
c462d32
Update include/CLI/Config.hpp
henryiii Oct 28, 2020
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
6 changes: 5 additions & 1 deletion include/CLI/Config.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,11 @@ inline std::vector<ConfigItem> ConfigBase::from_config(std::istream &input) cons
if(pos != std::string::npos) {
name = detail::trim_copy(line.substr(0, pos));
std::string item = detail::trim_copy(line.substr(pos + 1));
if(item.size() > 1 && item.front() == aStart && item.back() == aEnd) {
if(item.size() > 1 && item.front() == aStart) {
for(std::string multiline; item.back() != aEnd && std::getline(input, multiline);) {
detail::trim(multiline);
item += multiline;
}
items_buffer = detail::split_up(item.substr(1, item.length() - 2), aSep);
} else if((isDefaultArray || isINIArray) && item.find_first_of(aSep) != std::string::npos) {
items_buffer = detail::split_up(item, aSep);
Expand Down
41 changes: 41 additions & 0 deletions tests/ConfigFileTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,47 @@ TEST(StringBased, Vector) {
EXPECT_EQ("seven", output.at(2).inputs.at(2));
}

TEST(StringBased, TomlVector) {
std::stringstream ofile;

ofile << "one = [three]\n";
ofile << "two = [four]\n";
ofile << "five = [six, and, seven]\n";
ofile << "eight = [nine, \n"
"ten, eleven, twelve \n"
"]\n";
ofile << "one_more = [one, \n"
"two, three ] \n";

ofile.seekg(0, std::ios::beg);

std::vector<CLI::ConfigItem> output = CLI::ConfigINI().from_config(ofile);

EXPECT_EQ(5u, output.size());
EXPECT_EQ("one", output.at(0).name);
EXPECT_EQ(1u, output.at(0).inputs.size());
EXPECT_EQ("three", output.at(0).inputs.at(0));
EXPECT_EQ("two", output.at(1).name);
EXPECT_EQ(1u, output.at(1).inputs.size());
EXPECT_EQ("four", output.at(1).inputs.at(0));
EXPECT_EQ("five", output.at(2).name);
EXPECT_EQ(3u, output.at(2).inputs.size());
EXPECT_EQ("six", output.at(2).inputs.at(0));
EXPECT_EQ("and", output.at(2).inputs.at(1));
EXPECT_EQ("seven", output.at(2).inputs.at(2));
EXPECT_EQ("eight", output.at(3).name);
EXPECT_EQ(4u, output.at(3).inputs.size());
EXPECT_EQ("nine", output.at(3).inputs.at(0));
EXPECT_EQ("ten", output.at(3).inputs.at(1));
EXPECT_EQ("eleven", output.at(3).inputs.at(2));
EXPECT_EQ("twelve", output.at(3).inputs.at(3));
EXPECT_EQ("one_more", output.at(4).name);
EXPECT_EQ(3u, output.at(4).inputs.size());
EXPECT_EQ("one", output.at(4).inputs.at(0));
EXPECT_EQ("two", output.at(4).inputs.at(1));
EXPECT_EQ("three", output.at(4).inputs.at(2));
}

TEST(StringBased, Spaces) {
std::stringstream ofile;

Expand Down