Allow seen_count to be bound to a variable for dealing with optional arguments

[libs/core.git] / source / core / getopt.cpp

diff --git a/source/core/getopt.cpp b/source/core/getopt.cpp
index cfc9d7a02fa99e547cc19afefecf6c32250691b3..34e53172aeb194d1cebc29c7df4de8719add8c27 100644 (file)
--- a/source/core/getopt.cpp
+++ b/source/core/getopt.cpp
@@ -17,6 +17,23 @@ GetOpt::~GetOpt()
                delete *i;
 }
 
+GetOpt::OptBase &GetOpt::add_option(OptBase *opt)
+{
+       for(list<OptBase *>::iterator i=opts.begin(); i!=opts.end(); )
+       {
+               if((opt->get_short()!=0 && (*i)->get_short()==opt->get_short()) || (*i)->get_long()==opt->get_long())
+               {
+                       delete *i;
+                       opts.erase(i++);
+               }
+               else
+                       ++i;
+       }
+
+       opts.push_back(opt);
+       return *opts.back();
+}
+
 GetOpt::OptBase &GetOpt::get_option(char s)
 {
        for(list<OptBase *>::iterator i=opts.begin(); i!=opts.end(); ++i)
@@ -210,6 +227,7 @@ GetOpt::OptBase::OptBase(char s, const std::string &l, ArgType a):
        lng(l),
        arg_type(a),
        seen_count(0),
+       ext_seen_count(0),
        metavar("ARG")
 {
        if(lng.empty())
@@ -229,11 +247,19 @@ GetOpt::OptBase &GetOpt::OptBase::set_help(const string &h, const string &m)
        return *this;
 }
 
+GetOpt::OptBase &GetOpt::OptBase::bind_seen_count(unsigned &c)
+{
+       ext_seen_count = &c;
+       return *this;
+}
+
 void GetOpt::OptBase::process()
 {
        if(arg_type==REQUIRED_ARG)
                throw usage_error("--"+lng+" requires an argument");
        ++seen_count;
+       if(ext_seen_count)
+               *ext_seen_count = seen_count;
 
        store();
 }
@@ -243,6 +269,8 @@ void GetOpt::OptBase::process(const string &arg)
        if(arg_type==NO_ARG)
                throw usage_error("--"+lng+" takes no argument");
        ++seen_count;
+       if(ext_seen_count)
+               *ext_seen_count = seen_count;
 
        store(arg);
 }