GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-08-28 13:37:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Context

Browse source 
- Removed last calls to Parser::.
This commit is contained in:
Paul Beckingham 2014-11-02 22:19:20 -05:00
parent 9c245f838a
commit 7ad99cb7fa
1 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/Context.cpp
View file

@ -34,7 +34,6 @@
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <Context.h> #include <Context.h>
#include <Parser.h> // TODO Remove
#include <Directory.h> #include <Directory.h>
#include <File.h> #include <File.h>
#include <Eval.h> #include <Eval.h>
@ -131,7 +130,7 @@ int Context::initialize (int argc, const char** argv)
// Assume default .taskrc and .task locations. // Assume default .taskrc and .task locations.
assumeLocations (); assumeLocations ();
// The parser needs all the help it can get. // The CLI parser needs all the help it can get.
setupEntities (); setupEntities ();
// Scan command line for 'rc:<file>' only. // Scan command line for 'rc:<file>' only.
@ -151,18 +150,12 @@ int Context::initialize (int argc, const char** argv)
config.load (rc_file); config.load (rc_file);
loadAliases (); loadAliases ();
// These are needed in Parser::initialize. // These are useful for parsing.
Lexer::dateFormat = config.get ("dateformat"); Lexer::dateFormat = config.get ("dateformat");
Variant::dateFormat = config.get ("dateformat"); Variant::dateFormat = config.get ("dateformat");
Variant::searchCaseSensitive = config.getBoolean ("search.case.sensitive"); Variant::searchCaseSensitive = config.getBoolean ("search.case.sensitive");
Variant::searchUsingRegex = config.getBoolean ("regex"); Variant::searchUsingRegex = config.getBoolean ("regex");
Parser parser;
parser.initialize (argc, argv); // task arg0 arg1 ...
// Process 'rc:<file>' command line override.
parser.findOverrides (); // rc:<file> rc.<name>:<value>
// The data location, Context::data_dir, is determined from the assumed // The data location, Context::data_dir, is determined from the assumed
// location (~/.task), or set by data.location in the config file, or // location (~/.task), or set by data.location in the config file, or
// overridden by rc.data.location on the command line. // overridden by rc.data.location on the command line.
@ -404,7 +397,7 @@ int Context::run ()
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Dispatch to the command found by the parser. // Dispatch to the command found by the CLI parser.
int Context::dispatch (std::string &out) int Context::dispatch (std::string &out)
{ {
// Autocomplete args against keywords. // Autocomplete args against keywords.