Make sure options message appears before positionals

Taywee · Jan 9, 2023 · cecfe06 · cecfe06
1 parent 3e70c39
commit cecfe06
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/args.hxx b/args.hxx
@@ -2014,7 +2014,16 @@ namespace args
             {
                 UpdateSubparserHelp(params);
 
-                auto res = Group::GetProgramLine(params);
+                std::vector<std::string> res;
+
+                if ((subparserHasFlag || Group::HasFlag()) && params.showProglineOptions && !params.proglineShowFlags)
+                {
+                    res.push_back(params.proglineOptions);
+                }
+
+                auto group_res = Group::GetProgramLine(params);
+                std::move(std::move(group_res).begin(), std::move(group_res).end(), std::back_inserter(res));
+
                 res.insert(res.end(), subparserProgramLine.begin(), subparserProgramLine.end());
 
                 if (!params.proglineCommand.empty() && (Group::HasCommand() || subparserHasCommand))
@@ -2027,11 +2036,6 @@ namespace args
                     res.insert(res.begin(), Name());
                 }
 
-                if ((subparserHasFlag || Group::HasFlag()) && params.showProglineOptions && !params.proglineShowFlags)
-                {
-                    res.push_back(params.proglineOptions);
-                }
-
                 if (!ProglinePostfix().empty())
                 {
                     std::string line;

diff --git a/examples/gitlike.cxx b/examples/gitlike.cxx
@@ -5,7 +5,7 @@
 #include <iostream>
 #include <unordered_map>
 #include <functional>
-#include <args.hxx>
+#include "args.hxx"
 
 void Init(const std::string &progname, std::vector<std::string>::const_iterator beginargs, std::vector<std::string>::const_iterator endargs);
 void Add(const std::string &progname, std::vector<std::string>::const_iterator beginargs, std::vector<std::string>::const_iterator endargs);