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 
- Renamed the ::desugar* methods to be more specific.
This commit is contained in:
Paul Beckingham 2014-11-09 11:14:34 -05:00
parent 3b1f244f42
commit 9d0ae4f09d
2 changed files with 20 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/CLI.cpp
View file

@ -27,7 +27,6 @@
#include <cmake.h>
#include <sstream>
#include <algorithm>
#include <iostream> // TODO Remove.
#include <Context.h>
#include <Nibbler.h>
#include <Lexer.h>
@ -429,15 +428,15 @@ void CLI::analyze (bool parse /* = true */, bool strict /* = false */)
findIDs ();
findUUIDs ();
insertIDExpr ();
desugarTags ();
desugarFilterTags ();
findStrayModifications ();
desugarAttributes ();
desugarAttributeModifiers ();
desugarPatterns ();
desugarFilterAttributes ();
desugarFilterAttributeModifiers ();
desugarFilterPatterns ();
findOperators ();
findAttributes ();
insertJunctions ();
desugarPlainArgs ();
desugarFilterPlainArgs ();
// Decompose the elements for MODIFICATIONs.
decomposeModAttributes ();
@ -887,7 +886,7 @@ bool CLI::exactMatch (
////////////////////////////////////////////////////////////////////////////////
// +tag --> tags _hastag_ tag
// -tag --> tags _notag_ tag
void CLI::desugarTags ()
void CLI::desugarFilterTags ()
{
bool changes = false;
std::vector <A> reconstructed;
@ -934,7 +933,7 @@ void CLI::desugarTags ()
_args = reconstructed;
if (context.config.getInteger ("debug.parser") >= 3)
context.debug (context.cli.dump ("CLI::analyze desugarTags"));
context.debug (context.cli.dump ("CLI::analyze desugarFilterTags"));
}
}
@ -966,7 +965,7 @@ void CLI::findStrayModifications ()
////////////////////////////////////////////////////////////////////////////////
// <name>:['"][<value>]['"] --> name = value
void CLI::desugarAttributes ()
void CLI::desugarFilterAttributes ()
{
bool changes = false;
std::vector <A> reconstructed;
@ -1069,13 +1068,13 @@ void CLI::desugarAttributes ()
_args = reconstructed;
if (context.config.getInteger ("debug.parser") >= 3)
context.debug (context.cli.dump ("CLI::analyze desugarAttributes"));
context.debug (context.cli.dump ("CLI::analyze desugarFilterAttributes"));
}
}
////////////////////////////////////////////////////////////////////////////////
// <name>.[~]<mod>[:=]['"]<value>['"] --> name <op> value
void CLI::desugarAttributeModifiers ()
void CLI::desugarFilterAttributeModifiers ()
{
bool changes = false;
std::vector <A> reconstructed;
@ -1253,13 +1252,13 @@ void CLI::desugarAttributeModifiers ()
_args = reconstructed;
if (context.config.getInteger ("debug.parser") >= 3)
context.debug (context.cli.dump ("CLI::analyze desugarAttributeModifiers"));
context.debug (context.cli.dump ("CLI::analyze desugarFilterAttributeModifiers"));
}
}
////////////////////////////////////////////////////////////////////////////////
// /pattern/ --> description ~ 'pattern'
void CLI::desugarPatterns ()
void CLI::desugarFilterPatterns ()
{
bool changes = false;
std::vector <A> reconstructed;
@ -1303,7 +1302,7 @@ void CLI::desugarPatterns ()
_args = reconstructed;
if (context.config.getInteger ("debug.parser") >= 3)
context.debug (context.cli.dump ("CLI::analyze desugarPatterns"));
context.debug (context.cli.dump ("CLI::analyze desugarFilterPatterns"));
}
}
@ -1606,7 +1605,7 @@ void CLI::insertIDExpr ()
}
////////////////////////////////////////////////////////////////////////////////
void CLI::desugarPlainArgs ()
void CLI::desugarFilterPlainArgs ()
{
bool changes = false;
std::vector <A> reconstructed;
@ -1650,7 +1649,7 @@ void CLI::desugarPlainArgs ()
_args = reconstructed;
if (context.config.getInteger ("debug.parser") >= 3)
context.debug (context.cli.dump ("CLI::analyze desugarPlainArgs"));
context.debug (context.cli.dump ("CLI::analyze desugarFilterPlainArgs"));
}
}

10
src/CLI.h
View file

@ -92,15 +92,15 @@ private:
void findOverrides ();
void categorize ();
bool exactMatch (const std::string&, const std::string&) const;
void desugarTags ();
void desugarFilterTags ();
void findStrayModifications ();
void desugarAttributes ();
void desugarAttributeModifiers ();
void desugarPatterns ();
void desugarFilterAttributes ();
void desugarFilterAttributeModifiers ();
void desugarFilterPatterns ();
void findIDs ();
void findUUIDs ();
void insertIDExpr ();
void desugarPlainArgs ();
void desugarFilterPlainArgs ();
void findOperators ();
void findAttributes ();
void insertJunctions ();