mirror of
https://github.com/GothenburgBitFactory/taskwarrior.git
synced 2025-06-26 10:54:26 +02:00
CLI2: Integrated Lexer::decomposeSubstitution
- Task::modify now considers the 'g' at the end of a substitution to be a string of characters, which may contain 'g'. No other flags are currently supported.
This commit is contained in:
parent
1bef45ff47
commit
1f8a66b7f3
3 changed files with 15 additions and 14 deletions
19
src/CLI2.cpp
19
src/CLI2.cpp
|
@ -159,23 +159,22 @@ void A2::decompose ()
|
|||
|
||||
else if (_lextype == Lexer::Type::substitution)
|
||||
{
|
||||
std::string raw = _attributes["raw"];
|
||||
|
||||
//if (Directory (raw).exists ())
|
||||
// return;
|
||||
|
||||
auto slash1 = raw.find ("/");
|
||||
auto slash2 = raw.find ("/", slash1 + 1);
|
||||
auto slash3 = raw.find ("/", slash2 + 1);
|
||||
|
||||
attribute ("from", raw.substr (slash1 + 1, slash2 - slash1 - 1));
|
||||
attribute ("to", raw.substr (slash2 + 1, slash3 - slash2 - 1));
|
||||
attribute ("global", raw.substr (slash3 + 1) == "g" ? 1 : 0);
|
||||
std::string from;
|
||||
std::string to;
|
||||
std::string flags;
|
||||
if (Lexer::decomposeSubstitution (_attributes["raw"], from, to, flags))
|
||||
{
|
||||
attribute ("from", from);
|
||||
attribute ("to", to);
|
||||
attribute ("flags", flags);
|
||||
}
|
||||
}
|
||||
|
||||
else if (_lextype == Lexer::Type::pair)
|
||||
{
|
||||
std::string raw = _attributes["raw"];
|
||||
std::string name;
|
||||
std::string mod;
|
||||
std::string sep;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue