X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fcore%2Fgetopt.cpp;h=34e53172aeb194d1cebc29c7df4de8719add8c27;hp=74f14761c8636c19c7612cd27972ae5ac683832d;hb=9f8d6a18f68fb54b62e9f4a5cf1a1650282b3667;hpb=d5dd704b2576f878809e87dbb8ff8591b9bdbce4

diff --git a/source/core/getopt.cpp b/source/core/getopt.cpp
index 74f1476..34e5317 100644
--- a/source/core/getopt.cpp
+++ b/source/core/getopt.cpp
@@ -1,28 +1,45 @@
-/* $Id$
-
-This file is part of libmspcore
-Copyright © 2006-2009, 2011 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
+#include <msp/strings/format.h>
 #include "getopt.h"
 
 using namespace std;
 
 namespace Msp {
 
+GetOpt::GetOpt():
+	help(false)
+{
+	add_option("help", help, NO_ARG).set_help("Displays this help");
+}
+
 GetOpt::~GetOpt()
 {
 	for(list<OptBase *>::iterator i=opts.begin(); i!=opts.end(); ++i)
 		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)
 		if((*i)->get_short()==s)
 			return **i;
-	throw UsageError(string("Unknown option -")+s);
+	throw usage_error(string("Unknown option -")+s);
 }
 
 GetOpt::OptBase &GetOpt::get_option(const string &l)
@@ -30,32 +47,42 @@ GetOpt::OptBase &GetOpt::get_option(const string &l)
 	for(list<OptBase *>::iterator i=opts.begin(); i!=opts.end(); ++i)
 		if((*i)->get_long()==l)
 			return **i;
-	throw UsageError(string("Unknown option --")+l);
+	throw usage_error(string("Unknown option --")+l);
 }
 
 void GetOpt::operator()(unsigned argc, const char *const *argv)
 {
-	unsigned i = 1;
-	for(; i<argc;)
+	try
 	{
-		if(argv[i][0]=='-')
+		unsigned i = 1;
+		for(; i<argc;)
 		{
-			if(argv[i][1]=='-')
+			if(argv[i][0]=='-')
 			{
-				if(!argv[i][2])
-					break;
-
-				i += process_long(argv+i);
+				if(argv[i][1]=='-')
+				{
+					if(!argv[i][2])
+						break;
+
+					i += process_long(argv+i);
+				}
+				else
+					i += process_short(argv+i);
 			}
 			else
-				i += process_short(argv+i);
+				args.push_back(argv[i++]);
 		}
-		else
-			args.push_back(argv[i++]);
+		
+		for(; i<argc; ++i)
+			args.push_back(argv[i]);
 	}
-	
-	for(; i<argc; ++i)
-		args.push_back(argv[i]);
+	catch(const usage_error &e)
+	{
+		throw usage_error(e.what(), "Usage: "+generate_usage(argv[0]));
+	}
+
+	if(help)
+		throw usage_error(string("Help for ")+argv[0]+":", generate_help());
 }
 
 unsigned GetOpt::process_long(const char *const *argp)
@@ -75,7 +102,7 @@ unsigned GetOpt::process_long(const char *const *argp)
 	else if(opt.get_arg_type()==REQUIRED_ARG)
 	{
 		if(!argp[1])
-			throw UsageError("Premature end of arguments");
+			throw usage_error("--"+string(arg)+" requires an argument");
 
 		// Process the next argument as option argument
 		opt.process(argp[1]);
@@ -106,7 +133,7 @@ unsigned GetOpt::process_short(const char *const *argp)
 		else if(opt.get_arg_type()==REQUIRED_ARG)
 		{
 			if(!argp[1])
-				throw UsageError("Premature end of arguments");
+				throw usage_error("-"+string(1, *arg)+" requires an argument");
 			
 			// Use the next argument as option argument
 			opt.process(argp[1]);
@@ -121,35 +148,33 @@ unsigned GetOpt::process_short(const char *const *argp)
 
 string GetOpt::generate_usage(const string &argv0) const
 {
-	ostringstream line;
-	
-	line<<argv0;
+	string result = argv0;
 	for(list<OptBase *>::const_iterator i=opts.begin(); i!=opts.end(); ++i)
 	{
-		line<<" [";
+		result += " [";
 		if((*i)->get_short())
 		{
-			line<<'-'<<(*i)->get_short();
+			result += format("-%c", (*i)->get_short());
 			if(!(*i)->get_long().empty())
-				line<<'|';
+				result += '|';
 			else if((*i)->get_arg_type()==OPTIONAL_ARG)
-				line<<'['<<(*i)->get_metavar()<<']';
+				result += format("[%s]", (*i)->get_metavar());
 			else if((*i)->get_arg_type()==REQUIRED_ARG)
-				line<<' '<<(*i)->get_metavar();
+				result += format(" %s", (*i)->get_metavar());
 		}
 		if(!(*i)->get_long().empty())
 		{
-			line<<"--"<<(*i)->get_long();
+			result += format("--%s", (*i)->get_long());
 
 			if((*i)->get_arg_type()==OPTIONAL_ARG)
-				line<<"[="<<(*i)->get_metavar()<<']';
+				result += format("[=%s]", (*i)->get_metavar());
 			else if((*i)->get_arg_type()==REQUIRED_ARG)
-				line<<'='<<(*i)->get_metavar();
+				result += format("=%s", (*i)->get_metavar());
 		}
-		line<<']';
+		result += ']';
 	}
 
-	return line.str();
+	return result;
 }
 
 string GetOpt::generate_help() const
@@ -162,41 +187,36 @@ string GetOpt::generate_help() const
 	list<string> switches;
 	for(list<OptBase *>::const_iterator i=opts.begin(); i!=opts.end(); ++i)
 	{
-		ostringstream swtch;
+		string swtch;
 		if((*i)->get_short())
 		{
-			swtch<<'-'<<(*i)->get_short();
+			swtch += format("-%c", (*i)->get_short());
 			if(!(*i)->get_long().empty())
-				swtch<<", ";
+				swtch += ", ";
 			else if((*i)->get_arg_type()==OPTIONAL_ARG)
-				swtch<<'['<<(*i)->get_metavar()<<']';
+				swtch += format("[%s]", (*i)->get_metavar());
 			else if((*i)->get_arg_type()==REQUIRED_ARG)
-				swtch<<' '<<(*i)->get_metavar();
+				swtch += format(" %s", (*i)->get_metavar());
 		}
 		else if(any_short)
-			swtch<<"    ";
+			swtch += "    ";
 		if(!(*i)->get_long().empty())
 		{
-			swtch<<"--"<<(*i)->get_long();
+			swtch += format("--%s", (*i)->get_long());
 
 			if((*i)->get_arg_type()==OPTIONAL_ARG)
-				swtch<<"[="<<(*i)->get_metavar()<<']';
+				swtch += format("[=%s]", (*i)->get_metavar());
 			else if((*i)->get_arg_type()==REQUIRED_ARG)
-				swtch<<'='<<(*i)->get_metavar();
+				swtch += format("=%s", (*i)->get_metavar());
 		}
-		switches.push_back(swtch.str());
-		maxw = max(maxw, switches.back().size());
+		switches.push_back(swtch);
+		maxw = max(maxw, swtch.size());
 	}
 
 	string result;
 	list<string>::const_iterator j = switches.begin();
 	for(list<OptBase *>::const_iterator i=opts.begin(); i!=opts.end(); ++i, ++j)
-	{
-		result += "  "+*j;
-		result += string(maxw+2-j->size(), ' ');
-		result += (*i)->get_help();
-		result += '\n';
-	}
+		result += format("  %s%s%s\n", *j, string(maxw+2-j->size(), ' '), (*i)->get_help());
 	
 	return result;
 }
@@ -207,8 +227,12 @@ 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())
+		throw invalid_argument("empty long option name");
+}
 
 GetOpt::OptBase &GetOpt::OptBase::set_help(const string &h)
 {
@@ -223,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 UsageError("--"+lng+" requires an argument");
+		throw usage_error("--"+lng+" requires an argument");
 	++seen_count;
+	if(ext_seen_count)
+		*ext_seen_count = seen_count;
 
 	store();
 }
@@ -235,8 +267,10 @@ void GetOpt::OptBase::process()
 void GetOpt::OptBase::process(const string &arg)
 {
 	if(arg_type==NO_ARG)
-		throw UsageError("--"+lng+" takes no argument");
+		throw usage_error("--"+lng+" takes no argument");
 	++seen_count;
+	if(ext_seen_count)
+		*ext_seen_count = seen_count;
 
 	store(arg);
 }