CLI: Added ::canonicalizeNames for commands and keywords

src/CLI.cpp

@@ -224,6 +224,7 @@ void CLI::analyze ()
   handleArg0 ();
   lexArguments ();
   findCommand ();
+  canonicalizeNames ();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -288,6 +289,45 @@ const std::string CLI::dump (const std::string& title) const
   return out.str ();
 }
 
+////////////////////////////////////////////////////////////////////////////////
+// Scan all arguments and canonicalize names that need it.
+void CLI::canonicalizeNames ()
+{
+  for (auto& a : _args)
+  {
+    auto raw = a.attribute ("raw");
+    std::string canonical;
+
+    // Commands.
+    if (exactMatch ("command", raw))
+    {
+      a.attribute ("canonical", raw);
+      a.tag ("CMD");
+      continue;
+    }
+    else if (canonicalize (canonical, "command", raw))
+    {
+      a.attribute ("canonical", canonical);
+      a.tag ("CMD");
+      continue;
+    }
+
+    // Commands.
+    if (exactMatch ("keyword", raw))
+    {
+      a.attribute ("canonical", raw);
+      a.tag ("KEYWORD");
+      continue;
+    }
+    else if (canonicalize (canonical, "keyword", raw))
+    {
+      a.attribute ("keyword", canonical);
+      a.tag ("KEYWORD");
+      continue;
+    }
+  }
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // Scan all arguments and if any are an exact match for a command name, then
 // tag as CMD. If an argument is an exact match for an attribute, despite being

src/CLI.h

@@ -65,6 +65,7 @@ public:
 private:
   void handleArg0 ();
   void lexArguments ();
+  void canonicalizeNames ();
   bool findCommand ();
   bool exactMatch (const std::string&, const std::string&) const;