delete *i;
}
-GetOpt::OptBase &GetOpt::add_option(OptBase *opt)
+GetOpt::OptionImpl &GetOpt::add_option(char s, const string &l, const Store &t, ArgType a)
{
+ if(l.empty())
+ throw invalid_argument("GetOpt::add_option");
+ if(t.is_list() && a!=REQUIRED_ARG)
+ throw invalid_argument("GetOpt::add_option");
+
for(OptionList::iterator i=opts.begin(); i!=opts.end(); )
{
- if((opt->get_short()!=0 && (*i)->get_short()==opt->get_short()) || (*i)->get_long()==opt->get_long())
+ if((s!=0 && (*i)->get_short()==s) || (*i)->get_long()==l)
{
delete *i;
opts.erase(i++);
++i;
}
- opts.push_back(opt);
+ opts.push_back(new OptionImpl(s, l, t, a));
return *opts.back();
}
-GetOpt::OptBase &GetOpt::get_option(char s)
+GetOpt::OptionImpl &GetOpt::get_option(char s)
{
for(OptionList::iterator i=opts.begin(); i!=opts.end(); ++i)
if((*i)->get_short()==s)
throw usage_error(string("Unknown option -")+s);
}
-GetOpt::OptBase &GetOpt::get_option(const string &l)
+GetOpt::OptionImpl &GetOpt::get_option(const string &l)
{
for(OptionList::iterator i=opts.begin(); i!=opts.end(); ++i)
if((*i)->get_long()==l)
unsigned equals = 0;
for(; arg[equals] && arg[equals]!='='; ++equals) ;
- OptBase &opt = get_option(string(arg, equals));
+ OptionImpl &opt = get_option(string(arg, equals));
if(arg[equals])
// Process the part after the = as option argument
// Loop through all characters in the argument
for(; *arg; ++arg)
{
- OptBase &opt = get_option(*arg);
+ OptionImpl &opt = get_option(*arg);
if(arg[1] && opt.get_arg_type()!=NO_ARG)
{
}
-GetOpt::OptBase::OptBase(char s, const std::string &l, ArgType a):
+GetOpt::OptionImpl::OptionImpl(char s, const std::string &l, const Store &t, ArgType a):
shrt(s),
lng(l),
arg_type(a),
seen_count(0),
ext_seen_count(0),
- metavar("ARG")
+ metavar("ARG"),
+ store(t.clone())
+{ }
+
+GetOpt::OptionImpl::~OptionImpl()
{
- if(lng.empty())
- throw invalid_argument("empty long option name");
+ delete store;
}
-GetOpt::OptBase &GetOpt::OptBase::set_help(const string &h)
+GetOpt::OptionImpl &GetOpt::OptionImpl::set_help(const string &h)
{
help = h;
return *this;
}
-GetOpt::OptBase &GetOpt::OptBase::set_help(const string &h, const string &m)
+GetOpt::OptionImpl &GetOpt::OptionImpl::set_help(const string &h, const string &m)
{
help = h;
metavar = m;
return *this;
}
-GetOpt::OptBase &GetOpt::OptBase::bind_seen_count(unsigned &c)
+GetOpt::OptionImpl &GetOpt::OptionImpl::bind_seen_count(unsigned &c)
{
ext_seen_count = &c;
return *this;
}
-void GetOpt::OptBase::process()
+void GetOpt::OptionImpl::process()
{
if(arg_type==REQUIRED_ARG)
throw usage_error("--"+lng+" requires an argument");
try
{
- store();
+ store->store();
}
catch(const exception &e)
{
}
}
-void GetOpt::OptBase::process(const string &arg)
+void GetOpt::OptionImpl::process(const string &arg)
{
if(arg_type==NO_ARG)
throw usage_error("--"+lng+" takes no argument");
try
{
- store(arg);
+ store->store(arg);
}
catch(const exception &e)
{