Maintain order of sub-commands in help printout

attah · Feb 25, 2024 · b74d2e0 · b74d2e0
1 parent 5064b62
commit b74d2e0
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/lib/argget.h b/lib/argget.h
@@ -376,10 +376,11 @@ class SubArgGet
   SubArgGet(const SubArgGet&) = delete;
   SubArgGet& operator=(const SubArgGet&) = delete;
 
-  SubArgGet(std::map<std::string, std::pair<std::list<SwitchArgBase*>, std::list<PosArg*>>> map)
+  SubArgGet(std::list<std::pair<std::string, std::pair<std::list<SwitchArgBase*>, std::list<PosArg*>>>> map)
   {
     for(const auto& [subCommand, args] : map)
     {
+      _order.push_back(subCommand);
       _subCommands[subCommand] = ArgGet(args.first, args.second);
     }
   }
@@ -432,9 +433,9 @@ class SubArgGet
     }
     else
     {
-      for(const auto& [subCommand, argGet] : _subCommands)
+      for(std::string subCommand : _order)
       {
-        help << _name << " " << subCommand << argGet._argHelp() << std::endl;
+        help << _name << " " << subCommand << _subCommands.at(subCommand)._argHelp() << std::endl;
       }
     }
     return help.str();
@@ -454,6 +455,7 @@ class SubArgGet
   std::string _name;
   std::string _subCommand;
   std::map<std::string, ArgGet> _subCommands;
+  std::list<std::string> _order;
   std::string _errMsg;
 
 };