A3t

- Relocated calls to findCommand, findUUIDList, findIdSequence from
  A3t::parse to Context::initialize.

src/A3t.cpp

@@ -120,14 +120,11 @@ Tree* A3t::parse ()
 {
   findBinary ();
   findTerminator ();
-  findCommand ();
   findSubstitution ();
   findPattern ();
   findTag ();
   findAttribute ();
   findAttributeModifier ();
-  findUUIDList ();           // Before findIdSequence
-  findIdSequence ();
   findOperator ();
 
   validate ();

src/A3t.h

@@ -45,6 +45,10 @@ public:
 
   void findFileOverride ();
   void findConfigOverride ();
+  void findCommand ();
+  void findIdSequence ();
+  void findUUIDList ();
+
   void get_overrides (std::string&, File&);
   void get_data_location (Path&);
   void apply_overrides ();
@@ -54,14 +58,11 @@ public:
 private:
   void findBinary ();
   void findTerminator ();
-  void findCommand ();
   void findPattern ();
   void findSubstitution ();
   void findTag ();
   void findAttribute ();
   void findAttributeModifier ();
-  void findIdSequence ();
-  void findUUIDList ();
   void findOperator ();
   void validate ();
 

src/Context.cpp

@@ -195,6 +195,12 @@ int Context::initialize (int argc, const char** argv)
     for (op = operators.begin (); op != operators.end (); ++op)
       a3t.entity ("operator", *op);
 
+    // Now the entities are loaded, parsing may resume.
+    a3t.findCommand ();                          // <cmd>
+    a3t.findUUIDList ();                         // <uuid> Before findIdSequence
+    a3t.findIdSequence ();                       // <id>
+    a3t.inject_defaults ();                      // rc.default.command
+
     // Static initialization to decouple code.
     staticInitialization ();
 
@@ -205,7 +211,6 @@ int Context::initialize (int argc, const char** argv)
 
     // Handle default command and assumed 'info' command.
     a3.inject_defaults ();
-    a3t.inject_defaults ();
 
     // The re-categorization allows all injected arguments to be properly given
     // a category.