Parser::extractCommand: parse with string_view instead of regex to avoid inconsistent behavior in libcs
This commit is contained in:
джерело
bcf9d605d2
коміт
da2a5b10fe
18
parser.cpp
18
parser.cpp
@ -65,15 +65,19 @@ std::vector<std::string> Parser::extractCategories(std::string content) const
|
||||
|
||||
std::string Parser::extractCommand(std::string cmdname, std::string content) const
|
||||
{
|
||||
std::string regstr = "(\\s|\\S)*\\[cmd\\:" + cmdname + "\\](.*?)\\[/cmd\\:" + cmdname + "\\](\\s|\\S)*";
|
||||
std::regex reg{regstr};
|
||||
std::smatch match;
|
||||
if(std::regex_match(content, match, reg))
|
||||
{
|
||||
std::string cmd = "[cmd:" + cmdname + "]";
|
||||
std::string cmdend = "[/cmd:" + cmdname + "]";
|
||||
|
||||
if(match.size() > 1)
|
||||
std::string_view view = content;
|
||||
size_t pos = 0;
|
||||
if((pos = view.find(cmd)) != std::string::npos)
|
||||
{
|
||||
view.remove_prefix(pos);
|
||||
view.remove_prefix(cmd.size());
|
||||
if((pos = view.find(cmdend)) != std::string::npos)
|
||||
{
|
||||
return match.str(2);
|
||||
auto result = view.substr(0, pos);
|
||||
return std::string{result};
|
||||
}
|
||||
}
|
||||
return "";
|
||||
|
Завантаження…
Посилання в новій задачі
Block a user