GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-06-26 10:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

CLI

Browse source 
- Implemented ::isPattern, and used it.
This commit is contained in:
Paul Beckingham 2014-10-27 18:53:09 -04:00
parent b1b40cacc1
commit 7b67e77752
2 changed files with 19 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/CLI.cpp
View file

@ -480,18 +480,14 @@ const std::string CLI::dump () const
// Either the arg is appended to _original_args intact, or the lexemes are.
void CLI::addArg (const std::string& arg)
{
// Do not lex RC overrides.
if (isRCOverride (arg))
_original_args.push_back (arg);
if (isConfigOverride (arg))
_original_args.push_back (arg);
// Do not lex patterns or single substitutions.
else if (arg.length () > 2 &&
arg[0] == '/' &&
arg[arg.length () - 1] == '/')
// Do not lex RC overrides, UUIDs, patterns.
if (isRCOverride (arg) ||
isConfigOverride (arg) ||
isUUID (arg) ||
isPattern (arg))
{
_original_args.push_back (arg);
}
// Do not lex substitutions.
else if (arg.length () > 2 &&
@ -500,10 +496,6 @@ void CLI::addArg (const std::string& arg)
arg[arg.length () - 1] == 'g')
_original_args.push_back (arg);
// Do not lex UUIDs.
else if (isUUID (arg))
_original_args.push_back (arg);
// Do not lex, unless lexing reveals OPs.
else
{
@ -1730,3 +1722,14 @@ bool CLI::isUUID (const std::string& raw) const
}
////////////////////////////////////////////////////////////////////////////////
bool CLI::isPattern (const std::string& raw) const
{
if (raw.length () > 2 &&
raw[0] == '/' &&
raw[raw.length () - 1] == '/')
return true;
return false;
}
////////////////////////////////////////////////////////////////////////////////

1
src/CLI.h
View file

@ -101,6 +101,7 @@ private:
bool isRCOverride (const std::string&) const;
bool isConfigOverride (const std::string&) const;
bool isUUID (const std::string&) const;
bool isPattern (const std::string&) const;
public:
std::multimap <std::string, std::string> _entities;