mirror of
https://github.com/GothenburgBitFactory/taskwarrior.git
synced 2025-08-29 17:07:19 +02:00
Context
- Removed all A3 references.
This commit is contained in:
parent
4b12c87c40
commit
afe4b6883f
2 changed files with 3 additions and 31 deletions
|
@ -103,20 +103,13 @@ int Context::initialize (int argc, const char** argv)
|
||||||
assumeLocations ();
|
assumeLocations ();
|
||||||
|
|
||||||
// Initialize the command line parser.
|
// Initialize the command line parser.
|
||||||
// TODO Obsolete.
|
|
||||||
a3.capture (argc, argv);
|
|
||||||
parser.initialize (argc, argv); // task arg0 arg1 ...
|
parser.initialize (argc, argv); // task arg0 arg1 ...
|
||||||
|
|
||||||
// echo one two -- three | task zero --> task zero one two
|
// echo one two -- three | task zero --> task zero one two
|
||||||
// 'three' is left in the input buffer.
|
// 'three' is left in the input buffer.
|
||||||
// TODO Obsolete.
|
|
||||||
a3.append_stdin ();
|
|
||||||
parser.appendStdin (); // echo stdin0 | task ...
|
parser.appendStdin (); // echo stdin0 | task ...
|
||||||
|
|
||||||
// Process 'rc:<file>' command line override, and remove the argument from the
|
// Process 'rc:<file>' command line override.
|
||||||
// Context::a3.
|
|
||||||
// TODO Obsolete.
|
|
||||||
a3.categorize ();
|
|
||||||
parser.findOverrides (); // rc:<file> rc.<name>:<value>
|
parser.findOverrides (); // rc:<file> rc.<name>:<value>
|
||||||
parser.getOverrides (home_dir, rc_file); // <-- <file>
|
parser.getOverrides (home_dir, rc_file); // <-- <file>
|
||||||
|
|
||||||
|
@ -146,15 +139,11 @@ int Context::initialize (int argc, const char** argv)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create missing config file and data directory, if necessary.
|
// Create missing config file and data directory, if necessary.
|
||||||
// TODO Obsolete.
|
|
||||||
a3.apply_overrides ();
|
|
||||||
parser.applyOverrides ();
|
parser.applyOverrides ();
|
||||||
createDefaultConfig ();
|
createDefaultConfig ();
|
||||||
|
|
||||||
// Handle Aliases.
|
// Handle Aliases.
|
||||||
loadAliases ();
|
loadAliases ();
|
||||||
// TODO Obsolete.
|
|
||||||
a3.resolve_aliases ();
|
|
||||||
aliases2.load ();
|
aliases2.load ();
|
||||||
aliases2.resolve (parser.tree ());
|
aliases2.resolve (parser.tree ());
|
||||||
|
|
||||||
|
@ -205,21 +194,6 @@ int Context::initialize (int argc, const char** argv)
|
||||||
// Static initialization to decouple code.
|
// Static initialization to decouple code.
|
||||||
staticInitialization ();
|
staticInitialization ();
|
||||||
|
|
||||||
// TODO Obsolete.
|
|
||||||
// Categorize all arguments one more time. THIS IS NECESSARY - it helps the
|
|
||||||
// following inject_defaults method determine whether there needs to be a
|
|
||||||
// default command assumed.
|
|
||||||
a3.categorize ();
|
|
||||||
|
|
||||||
// TODO Obsolete.
|
|
||||||
// Handle default command and assumed 'info' command.
|
|
||||||
a3.inject_defaults ();
|
|
||||||
|
|
||||||
// TODO Obsolete.
|
|
||||||
// The re-categorization allows all injected arguments to be properly given
|
|
||||||
// a category.
|
|
||||||
a3.categorize ();
|
|
||||||
|
|
||||||
// Parse the command line.
|
// Parse the command line.
|
||||||
parser.parse ();
|
parser.parse ();
|
||||||
|
|
||||||
|
@ -736,8 +710,8 @@ void Context::decomposeSortField (
|
||||||
void Context::clear ()
|
void Context::clear ()
|
||||||
{
|
{
|
||||||
tdb2.clear ();
|
tdb2.clear ();
|
||||||
// TODO Obsolete.
|
|
||||||
a3.clear ();
|
// TODO parser.clear (); ?
|
||||||
|
|
||||||
// Eliminate the command objects.
|
// Eliminate the command objects.
|
||||||
std::map <std::string, Command*>::iterator com;
|
std::map <std::string, Command*>::iterator com;
|
||||||
|
|
|
@ -38,7 +38,6 @@
|
||||||
#include <Path.h>
|
#include <Path.h>
|
||||||
#include <File.h>
|
#include <File.h>
|
||||||
#include <Directory.h>
|
#include <Directory.h>
|
||||||
#include <A3.h>
|
|
||||||
#include <Parser.h>
|
#include <Parser.h>
|
||||||
#include <Timer.h>
|
#include <Timer.h>
|
||||||
|
|
||||||
|
@ -84,7 +83,6 @@ private:
|
||||||
|
|
||||||
public:
|
public:
|
||||||
std::string program;
|
std::string program;
|
||||||
A3 a3;
|
|
||||||
Parser parser;
|
Parser parser;
|
||||||
std::string home_dir;
|
std::string home_dir;
|
||||||
File rc_file;
|
File rc_file;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue