Skip to content
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.

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

Fixes option parsing on C++ libs that match EOL differently #136

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion docopt.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ static std::vector<std::string> parse_section(std::string const& name, std::stri
"(?:^|\\n)" // anchored at a linebreak (or start of string)
"("
"[^\\n]*" + name + "[^\\n]*(?=\\n?)" // a line that contains the name
"(?:\\n[ \\t].*?(?=\\n|$))*" // followed by any number of lines that are indented
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the issue that it won't match just a newline (without spaces)?

"(?:\\n*[ \\t].*?(?=\\n|$))*" // followed by any number of blank lines, or lines that are indented
")",
std::regex::icase
};
Expand Down
2 changes: 1 addition & 1 deletion docopt_private.h
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@ namespace docopt {
options_end = option_description.begin() + static_cast<std::ptrdiff_t>(double_space);
}

static const std::regex pattern {"(-{1,2})?(.*?)([,= ]|$)"};
static const std::regex pattern {"(-{1,2})?(.*?)([,= ]|$|\n)"};
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The |$ should match a newline right?

for(std::sregex_iterator i {option_description.begin(), options_end, pattern, std::regex_constants::match_not_null},
e{};
i != e;
Expand Down