X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fcore%2Fgetopt.cpp;h=2bbfebc5c7a867e200f1b5463d0c9db1894f3899;hp=cfc9d7a02fa99e547cc19afefecf6c32250691b3;hb=7e11b20594ae05177fe36701422a0faf6120c0b0;hpb=d16185720fa344263367dbd50c61bfc8183d99a4

diff --git a/source/core/getopt.cpp b/source/core/getopt.cpp
index cfc9d7a..2bbfebc 100644
--- a/source/core/getopt.cpp
+++ b/source/core/getopt.cpp
@@ -13,13 +13,30 @@ GetOpt::GetOpt():
 
 GetOpt::~GetOpt()
 {
-	for(list<OptBase *>::iterator i=opts.begin(); i!=opts.end(); ++i)
+	for(OptionList::iterator i=opts.begin(); i!=opts.end(); ++i)
 		delete *i;
 }
 
+GetOpt::OptBase &GetOpt::add_option(OptBase *opt)
+{
+	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())
+		{
+			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)
+	for(OptionList::iterator i=opts.begin(); i!=opts.end(); ++i)
 		if((*i)->get_short()==s)
 			return **i;
 	throw usage_error(string("Unknown option -")+s);
@@ -27,7 +44,7 @@ GetOpt::OptBase &GetOpt::get_option(char s)
 
 GetOpt::OptBase &GetOpt::get_option(const string &l)
 {
-	for(list<OptBase *>::iterator i=opts.begin(); i!=opts.end(); ++i)
+	for(OptionList::iterator i=opts.begin(); i!=opts.end(); ++i)
 		if((*i)->get_long()==l)
 			return **i;
 	throw usage_error(string("Unknown option --")+l);
@@ -132,7 +149,7 @@ unsigned GetOpt::process_short(const char *const *argp)
 string GetOpt::generate_usage(const string &argv0) const
 {
 	string result = argv0;
-	for(list<OptBase *>::const_iterator i=opts.begin(); i!=opts.end(); ++i)
+	for(OptionList::const_iterator i=opts.begin(); i!=opts.end(); ++i)
 	{
 		result += " [";
 		if((*i)->get_short())
@@ -163,12 +180,12 @@ string GetOpt::generate_usage(const string &argv0) const
 string GetOpt::generate_help() const
 {
 	bool any_short = false;
-	for(list<OptBase *>::const_iterator i=opts.begin(); (!any_short && i!=opts.end()); ++i)
+	for(OptionList::const_iterator i=opts.begin(); (!any_short && i!=opts.end()); ++i)
 		any_short = (*i)->get_short();
 
 	string::size_type maxw = 0;
 	list<string> switches;
-	for(list<OptBase *>::const_iterator i=opts.begin(); i!=opts.end(); ++i)
+	for(OptionList::const_iterator i=opts.begin(); i!=opts.end(); ++i)
 	{
 		string swtch;
 		if((*i)->get_short())
@@ -198,7 +215,7 @@ string GetOpt::generate_help() const
 
 	string result;
 	list<string>::const_iterator j = switches.begin();
-	for(list<OptBase *>::const_iterator i=opts.begin(); i!=opts.end(); ++i, ++j)
+	for(OptionList::const_iterator i=opts.begin(); i!=opts.end(); ++i, ++j)
 		result += format("  %s%s%s\n", *j, string(maxw+2-j->size(), ' '), (*i)->get_help());
 	
 	return result;
@@ -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,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