Move GetOpt exception handling to the .cpp file

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

diff --git a/source/core/getopt.cpp b/source/core/getopt.cpp
index 911b673d9b1d28358966a302de44aaf6428735e3..ad726448589cc0ebc38255cd7790cdbbaf0e0136 100644 (file)
--- a/source/core/getopt.cpp
+++ b/source/core/getopt.cpp
@@ -21,7 +21,7 @@ GetOpt::OptBase &GetOpt::add_option(OptBase *opt)
 {
        for(list<OptBase *>::iterator i=opts.begin(); i!=opts.end(); )
        {
-               if((*i)->get_short()==opt->get_short() || (*i)->get_long()==opt->get_long())
+               if((opt->get_short()!=0 && (*i)->get_short()==opt->get_short()) || (*i)->get_long()==opt->get_long())
                {
                        delete *i;
                        opts.erase(i++);
@@ -227,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())
@@ -246,22 +247,48 @@ 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();
+       try
+       {
+               store();
+       }
+       catch(const exception &e)
+       {
+               throw usage_error("Invalid argument for --"+lng+" ("+e.what()+")");
+       }
 }
 
 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);
+       try
+       {
+               store(arg);
+       }
+       catch(const exception &e)
+       {
+               throw usage_error("Invalid argument for --"+lng+" ("+e.what()+")");
+       }
 }
 
 } // namespace Msp