From ec2c2c8c3703d26042a0647ba5c3931e57187d3e Mon Sep 17 00:00:00 2001
From: zawz <zawz@hotmail.fr>
Date: Fri, 4 Oct 2019 02:47:42 +0200
Subject: [PATCH] options: added possibility to ignore negative numbers as
 options

---
 include/options.hpp |  4 +--
 src/options.cpp     | 85 +++++++++++++++++++++++++--------------------
 2 files changed, 49 insertions(+), 40 deletions(-)

diff --git a/include/options.hpp b/include/options.hpp
index aad170f..4a63406 100644
--- a/include/options.hpp
+++ b/include/options.hpp
@@ -136,12 +136,12 @@ namespace ztd
       @param arguments vector of string containing arguments and options
       @return Leftover arguments that are not options\n
     */
-    std::vector<std::string> process(std::vector<std::string> arguments);
+    std::vector<std::string> process(std::vector<std::string> arguments, bool ignore_numbers=false);
     //! @brief Process arguments through the option set
     /*!
       calls process(std::vector<std::string> arguments)
     */
-    inline std::vector<std::string> process(int argc, char** argv) { return this->process(ztd::argVector(argc, argv)); }
+    inline std::vector<std::string> process(int argc, char** argv, bool ignore_numbers=false) { return this->process(ztd::argVector(argc, argv), ignore_numbers); }
 
     //! @brief Options in the set
     std::vector<option> option_vec;
diff --git a/src/options.cpp b/src/options.cpp
index 91453a1..65dd548 100644
--- a/src/options.cpp
+++ b/src/options.cpp
@@ -159,7 +159,7 @@ ztd::option* ztd::option_set::find(std::string const& str)
   return nullptr;
 }
 
-std::vector<std::string> ztd::option_set::process(std::vector<std::string> arguments)
+std::vector<std::string> ztd::option_set::process(std::vector<std::string> arguments, bool ignore_numbers)
 {
   std::vector<std::string> out;
   unsigned int i=0;
@@ -213,46 +213,55 @@ std::vector<std::string> ztd::option_set::process(std::vector<std::string> argum
       else
       {
         i=1;
-        ztd::option* popt=nullptr;
-        bool tstop=false;
-        while( !tstop && it!=arguments.end() && (*it).size()>i )
+        if( ignore_numbers && (*it)[i] >= '0' && (*it)[i] <= '9')
         {
-          popt=this->find((*it)[i]);
-          if(popt==nullptr) //not found: error
-          {
-            throw ztd::option_error(ztd::option_error::unknown_option, std::string("-") + (*it)[i] );
-          }
-          if(popt->takesArgument) //no argument
-          {
+          while(it!=arguments.end() && (*it).size()>i)
             i++;
-            if((*it).size()<=i) //finishes here
-            {
-              if( ++it == arguments.end() )
-              {
-                throw ztd::option_error(ztd::option_error::missing_arg, std::string("-") +  popt->charName );
-              }
-              popt->activated = true;
-              popt->argument = (*it);
-              option_sequence.push_back(*popt);
-              tstop = true;
-            }
-            else //continue
-            {
-              if( (*it)[i] == '=')
-                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++;
+          out.push_back(*it);
         }
+        else
+        {
+          ztd::option* popt=nullptr;
+          bool tstop=false;
+          while( !tstop && it!=arguments.end() && (*it).size()>i )
+          {
+            popt=this->find((*it)[i]);
+            if(popt==nullptr) //not found: error
+            {
+              throw ztd::option_error(ztd::option_error::unknown_option, std::string("-") + (*it)[i] );
+            }
+            if(popt->takesArgument) //no argument
+            {
+              i++;
+              if((*it).size()<=i) //finishes here
+              {
+                if( ++it == arguments.end() )
+                {
+                  throw ztd::option_error(ztd::option_error::missing_arg, std::string("-") +  popt->charName );
+                }
+                popt->activated = true;
+                popt->argument = (*it);
+                option_sequence.push_back(*popt);
+                tstop = true;
+              }
+              else //continue
+              {
+                if( (*it)[i] == '=')
+                  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++;
+          } //while
+        } // if not number
       }
     }
     else