From 3c701c8d5b2d7546b77a395ccc33cb26a91cfe45 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sat, 19 Apr 2014 08:28:02 -0400
Subject: [PATCH] A3t

- Removed obsolete ::findAliases method.
---
 src/A3t.cpp     | 47 -----------------------------------------------
 src/A3t.h       |  1 -
 src/Context.cpp |  1 -
 src/args.cpp    |  4 +++-
 4 files changed, 3 insertions(+), 50 deletions(-)

diff --git a/src/A3t.cpp b/src/A3t.cpp
index 499d4fe1b..f940ad1b9 100644
--- a/src/A3t.cpp
+++ b/src/A3t.cpp
@@ -502,53 +502,6 @@ void A3t::inject_defaults ()
   }
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// An alias must be a distinct word on the command line.
-void A3t::findAliases ()
-{
-  bool something;
-  int safety_valve = safetyValveDefault;
-
-  do
-  {
-    something = false;
-
-    std::string command;
-    std::vector <Tree*>::iterator i;
-    for (i = _tree->_branches.begin (); i != _tree->_branches.end (); ++i)
-    {
-      // Parser override operator.
-      if ((*i)->attribute ("raw") == "--")
-        break;
-
-      // Skip known args.
-      if (! (*i)->hasTag ("?"))
-        continue;
-
-      std::string raw = (*i)->attribute ("raw");
-      std::map <std::string, std::string>::iterator match = context.aliases.find (raw);
-      if (match != context.aliases.end ())
-      {
-        something = true;
-
-        std::vector <std::string> words;
-        splitq (words, context.aliases[raw], ' ');
-
-        std::vector <std::string>::iterator word;
-        for (word = words.begin (); word != words.end (); ++word)
-        {
-          // TODO Insert branch (words) in place of (*i).
-          std::cout << "# alias word '" << *word << "'\n";
-        }
-      }
-    }
-  }
-  while (something && --safety_valve > 0);
-
-  if (safety_valve <= 0)
-    context.debug (format ("Nested alias limit of {1} reached.", safetyValveDefault));
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 void A3t::capture_first (const std::string& arg)
 {
diff --git a/src/A3t.h b/src/A3t.h
index 41f041f9a..278b5ea68 100644
--- a/src/A3t.h
+++ b/src/A3t.h
@@ -49,7 +49,6 @@ public:
   void findCommand ();
   void findIdSequence ();
   void findUUIDList ();
-  void findAliases ();
 
   void get_overrides (std::string&, File&);
   void get_data_location (Path&);
diff --git a/src/Context.cpp b/src/Context.cpp
index b6014ec81..8ce58078d 100644
--- a/src/Context.cpp
+++ b/src/Context.cpp
@@ -152,7 +152,6 @@ int Context::initialize (int argc, const char** argv)
     // Handle Aliases.
     loadAliases ();
     a3.resolve_aliases ();
-    a3t.findAliases ();
     aliases2.load ();
     aliases2.resolve (a3t.tree ());
 
diff --git a/src/args.cpp b/src/args.cpp
index b4000b7b5..13e7f190c 100644
--- a/src/args.cpp
+++ b/src/args.cpp
@@ -40,7 +40,9 @@ int main (int argc, const char** argv)
     a3t.append_stdin ();
     a3t.findFileOverride ();
     a3t.findConfigOverride ();
-    a3t.findAliases ();
+
+    Alias alias;
+    alias.resolve (a3t.tree ());
 
     // Reports.
     a3t.entity ("report",     "list");