gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Lexer: Improved ::decomposePattern to extract raw string

Browse Source
This commit is contained in:
Paul Beckingham
2015-07-25 00:34:18 -04:00
parent 41a76c6798
commit 4f0e32b69b
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Lexer.cpp
View File

@@ -1395,18 +1395,16 @@ bool Lexer::decomposePattern (
std::string& pattern, std::string& pattern,
std::string& flags) std::string& flags)
{ {
std::string parsed_pattern; std::string ignored;
std::string::size_type cursor = 0; std::string::size_type cursor = 0;
if (readWord (text, "/", cursor, parsed_pattern) && if (readWord (text, "/", cursor, ignored) &&
parsed_pattern.length ()) ignored.length ())
{ {
std::string parsed_flags = text.substr (cursor); auto parsed_flags = text.substr (cursor);
if (parsed_flags.find ("/") == std::string::npos) if (parsed_flags.find ("/") == std::string::npos)
{ {
dequote (parsed_pattern, "/");
pattern = parsed_pattern;
flags = parsed_flags; flags = parsed_flags;
pattern = text.substr (1, cursor - 2 - flags.length ());
return true; return true;
} }
} }