Code Cleanup

- Removed unused Context::extension_dir.
This commit is contained in:
Paul Beckingham 2014-04-13 15:22:23 -04:00
parent 75f938463e
commit a49d1bfbc0
2 changed files with 7 additions and 12 deletions

View file

@ -48,7 +48,6 @@
Context::Context () Context::Context ()
: rc_file () : rc_file ()
, data_dir () , data_dir ()
, extension_dir ()
, config () , config ()
, tdb2 () , tdb2 ()
, dom () , dom ()
@ -80,7 +79,11 @@ int Context::initialize (int argc, const char** argv)
try try
{ {
////////////////////////////////////////////////////////////////////////////
// BEGIN EXPERIMENTAL CODE // BEGIN EXPERIMENTAL CODE
//
// This experimental section will grow, and the original code below will
// shrink, and that is how the command line parser will be replaced.
// Initialize the command line parser. // Initialize the command line parser.
a3t.initialize (argc, argv); a3t.initialize (argc, argv);
@ -91,6 +94,7 @@ int Context::initialize (int argc, const char** argv)
//Tree* parseTree = a3t.parse (); //Tree* parseTree = a3t.parse ();
// END EXPERIMENTAL CODE // END EXPERIMENTAL CODE
////////////////////////////////////////////////////////////////////////////
@ -136,10 +140,6 @@ int Context::initialize (int argc, const char** argv)
header (format (STRING_CONTEXT_DATA_OVERRIDE, data_dir._data)); header (format (STRING_CONTEXT_DATA_OVERRIDE, data_dir._data));
} }
/* TODO Enable this when the time is right, say for 2.1
extension_dir = data_dir._data + "/extensions";
*/
// Create missing config file and data directory, if necessary. // Create missing config file and data directory, if necessary.
a3.apply_overrides (); a3.apply_overrides ();
createDefaultConfig (); createDefaultConfig ();
@ -179,6 +179,7 @@ int Context::initialize (int argc, const char** argv)
////////////////////////////////////////////////////////////////////////////
// BEGIN EXPERIMENTAL CODE // BEGIN EXPERIMENTAL CODE
// Initialize the command line parser. // Initialize the command line parser.
@ -186,6 +187,7 @@ int Context::initialize (int argc, const char** argv)
debug (parseTree->dump ()); debug (parseTree->dump ());
// END EXPERIMENTAL CODE // END EXPERIMENTAL CODE
////////////////////////////////////////////////////////////////////////////
@ -659,12 +661,6 @@ void Context::createDefaultConfig ()
// Create data location, if necessary. // Create data location, if necessary.
config.createDefaultData (data_dir); config.createDefaultData (data_dir);
// Create extension directory, if necessary.
/* TODO Enable this when the time is right, say for 2.4
if (! extension_dir.exists ())
extension_dir.create ();
*/
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////

View file

@ -88,7 +88,6 @@ public:
std::string home_dir; std::string home_dir;
File rc_file; File rc_file;
Path data_dir; Path data_dir;
Directory extension_dir;
Config config; Config config;
TDB2 tdb2; TDB2 tdb2;