From 96637468dcaa5a22ba9c9e29541775e393c0bcd6 Mon Sep 17 00:00:00 2001
From: zawz <zawz@hotmail.fr>
Date: Thu, 29 Aug 2019 17:50:19 +0200
Subject: [PATCH] options: added option_sequence

---
 include/options.hpp | 14 +++++++++++---
 src/options.cpp     | 21 +++++++++++++++++----
 2 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/include/options.hpp b/include/options.hpp
index 12351e6..aad170f 100644
--- a/include/options.hpp
+++ b/include/options.hpp
@@ -100,13 +100,18 @@ namespace ztd
   //! @brief Set of POSIX/GNU style options
   /*!
     Process arguments through it to extract options
+
+    After processing:
+    - for global option settings use find() or parse option_vec
+    - for sequential option settings parse option_sequence
+
   */
   class option_set
   {
   public:
     /*CREATION FUNCTIONS*/
     //! @brief Add option to the set
-    inline void add(option opt) { m_options.push_back(opt); }
+    inline void add(option opt) { option_vec.push_back(opt); }
 
     /*PRINT FUNCTIONS*/
     //! @brief Print help for the full option set
@@ -138,8 +143,11 @@ namespace ztd
     */
     inline std::vector<std::string> process(int argc, char** argv) { return this->process(ztd::argVector(argc, argv)); }
 
-  private:
-    std::vector<option> m_options;
+    //! @brief Options in the set
+    std::vector<option> option_vec;
+
+    //! @brief Ordered result of option processing
+    std::vector<option> option_sequence;
   };
 
 } //ztd
diff --git a/src/options.cpp b/src/options.cpp
index 0878ef3..91453a1 100644
--- a/src/options.cpp
+++ b/src/options.cpp
@@ -98,7 +98,8 @@ ztd::option::option(const option& opt)
   //help
   help_text=opt.help_text;
   //init
-  activated=false;
+  activated=opt.activated;
+  argument=opt.argument;
 }
 
 void ztd::option::print_help(int leftpad, int rightpad) const
@@ -134,13 +135,13 @@ void ztd::option::print_help(int leftpad, int rightpad) const
 
 void ztd::option_set::print_help(int leftpad, int rightpad) const
 {
-  for(auto it : this->m_options)
+  for(auto it : this->option_vec)
     it.print_help(leftpad,rightpad);
 }
 
 ztd::option* ztd::option_set::find(char c)
 {
-  for( auto it=m_options.begin() ; it!=m_options.end() ; it++ )
+  for( auto it=option_vec.begin() ; it!=option_vec.end() ; it++ )
   {
     if(it->shortDef && it->charName == c)
       return &*it;
@@ -150,7 +151,7 @@ ztd::option* ztd::option_set::find(char c)
 
 ztd::option* ztd::option_set::find(std::string const& str)
 {
-  for( auto it=m_options.begin() ; it!=m_options.end() ; it++ )
+  for( auto it=option_vec.begin() ; it!=option_vec.end() ; it++ )
   {
     if(it->longDef && it->strName == str)
       return &*it;
@@ -162,6 +163,7 @@ std::vector<std::string> ztd::option_set::process(std::vector<std::string> argum
 {
   std::vector<std::string> out;
   unsigned int i=0;
+  option_sequence.clear();
   for( auto it = arguments.begin(); it!=arguments.end() ; it++ )
   {
     if( (*it).size()>0 && (*it)[0]=='-' )
@@ -184,9 +186,13 @@ std::vector<std::string> ztd::option_set::process(std::vector<std::string> argum
             }
             popt->activated = true;
             popt->argument = (*it);
+            option_sequence.push_back(*popt);
           }
           else
+          {
             popt->activated = true;
+            option_sequence.push_back(*popt);
+          }
         }
         else
         {
@@ -199,7 +205,9 @@ std::vector<std::string> ztd::option_set::process(std::vector<std::string> argum
           {
             throw ztd::option_error(ztd::option_error::takes_no_arg, "--" + popt->strName);
           }
+          popt->activated = true;
           popt->argument = (*it).substr(eqn+1,(*it).size()-eqn-1 );
+          option_sequence.push_back(*popt);
         }
       }
       else
@@ -225,6 +233,7 @@ std::vector<std::string> ztd::option_set::process(std::vector<std::string> argum
               }
               popt->activated = true;
               popt->argument = (*it);
+              option_sequence.push_back(*popt);
               tstop = true;
             }
             else //continue
@@ -233,11 +242,15 @@ std::vector<std::string> ztd::option_set::process(std::vector<std::string> argum
                 i++;
               popt->argument = (*it).substr(i , (*it).size()-i );
               popt->activated = true;
+              option_sequence.push_back(*popt);
               tstop=true;
             }
           }
           else //no argument
+          {
             popt->activated = true;
+            option_sequence.push_back(*popt);
+          }
           i++;
         }
       }