X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=source%2Fcore%2Fgetopt.cpp;h=0f8886ad746a542e3a40b36ed8e7c2ddcd0c1e19;hp=fdeb2f8827b2a48075068d153d1cea2597f6ccb1;hb=20c897ece781e18ba54c41fd68e232ce566a938d;hpb=6f0c4c39133e08c05ffb1f1d53141a7e80ba6351

diff --git a/source/core/getopt.cpp b/source/core/getopt.cpp
index fdeb2f8..0f8886a 100644
--- a/source/core/getopt.cpp
+++ b/source/core/getopt.cpp
@@ -15,6 +15,8 @@ GetOpt::~GetOpt()
 {
 	for(OptionList::iterator i=opts.begin(); i!=opts.end(); ++i)
 		delete *i;
+	for(ArgumentList::iterator i=args.begin(); i!=args.end(); ++i)
+		delete *i;
 }
 
 GetOpt::OptionImpl &GetOpt::add_option(char s, const string &l, const Store &t, ArgType a)
@@ -39,6 +41,30 @@ GetOpt::OptionImpl &GetOpt::add_option(char s, const string &l, const Store &t,
 	return *opts.back();
 }
 
+GetOpt::ArgumentImpl &GetOpt::add_argument(const string &n, const Store &t, ArgType a)
+{
+	if(a==NO_ARG)
+		throw invalid_argument("GetOpt::add_argument");
+
+	bool have_list = false;
+	bool have_optional = false;
+	for(ArgumentList::const_iterator i=args.begin(); i!=args.end(); ++i)
+	{
+		if((*i)->is_list_store())
+			have_list = true;
+		else if((*i)->get_type()==OPTIONAL_ARG)
+			have_optional = true;
+	}
+
+	if(have_optional && (t.is_list() || a!=OPTIONAL_ARG))
+		throw invalid_argument("GetOpt::add_argument");
+	if(have_list && (t.is_list() || a==OPTIONAL_ARG))
+		throw invalid_argument("GetOpt::add_argument");
+
+	args.push_back(new ArgumentImpl(n, t, a));
+	return *args.back();
+}
+
 GetOpt::OptionImpl &GetOpt::get_option(char s)
 {
 	for(OptionList::iterator i=opts.begin(); i!=opts.end(); ++i)
@@ -59,6 +85,8 @@ void GetOpt::operator()(unsigned argc, const char *const *argv)
 {
 	try
 	{
+		/* Arguments must first be collected into an array to handle the case
+		where a variable-length argument list is followed by fixed arguments. */
 		unsigned i = 1;
 		for(; i<argc;)
 		{
@@ -75,19 +103,46 @@ void GetOpt::operator()(unsigned argc, const char *const *argv)
 					i += process_short(argv+i);
 			}
 			else
-				args.push_back(argv[i++]);
+				args_raw.push_back(argv[i++]);
 		}
-		
+
 		for(; i<argc; ++i)
-			args.push_back(argv[i]);
+			args_raw.push_back(argv[i]);
+
+		i = 0;
+		for(ArgumentList::const_iterator j=args.begin(); j!=args.end(); ++j)
+		{
+			if((*j)->is_list_store())
+			{
+				unsigned end = args_raw.size();
+				for(ArgumentList::const_iterator k=j; ++k!=args.end(); )
+					--end;
+				if(i==end && (*j)->get_type()==REQUIRED_ARG)
+					throw usage_error((*j)->get_name()+" is required");
+				for(; i<end; ++i)
+					(*j)->process(args_raw[i]);
+			}
+			else
+			{
+				if(i<args_raw.size())
+					(*j)->process(args_raw[i++]);
+				else if((*j)->get_type()==REQUIRED_ARG)
+					throw usage_error((*j)->get_name()+" is required");
+			}
+		}
+
+		// XXX Enable this when get_args() is completely removed
+		/*if(i<args_raw.size())
+			throw usage_error("Extra positional arguments");*/
 	}
 	catch(const usage_error &e)
 	{
-		throw usage_error(e.what(), "Usage: "+generate_usage(argv[0]));
+		if(!help)
+			throw usage_error(e.what(), "Usage: "+generate_usage(argv[0]));
 	}
 
 	if(help)
-		throw usage_error(string("Help for ")+argv[0]+":", generate_help());
+		throw usage_error(string("Help for ")+argv[0]+":", "\nUsage:\n  "+generate_usage(argv[0], true)+"\n\n"+generate_help());
 }
 
 unsigned GetOpt::process_long(const char *const *argp)
@@ -98,9 +153,9 @@ unsigned GetOpt::process_long(const char *const *argp)
 	// See if the argument contains an =
 	unsigned equals = 0;
 	for(; arg[equals] && arg[equals]!='='; ++equals) ;
-	
+
 	OptionImpl &opt = get_option(string(arg, equals));
-	
+
 	if(arg[equals])
 		// Process the part after the = as option argument
 		opt.process(arg+equals+1);
@@ -115,7 +170,7 @@ unsigned GetOpt::process_long(const char *const *argp)
 	}
 	else
 		opt.process();
-	
+
 	return 1;
 }
 
@@ -139,7 +194,7 @@ unsigned GetOpt::process_short(const char *const *argp)
 		{
 			if(!argp[1])
 				throw usage_error("-"+string(1, *arg)+" requires an argument");
-			
+
 			// Use the next argument as option argument
 			opt.process(argp[1]);
 			return 2;
@@ -151,32 +206,49 @@ unsigned GetOpt::process_short(const char *const *argp)
 	return 1;
 }
 
-string GetOpt::generate_usage(const string &argv0) const
+string GetOpt::generate_usage(const string &argv0, bool compact) const
 {
 	string result = argv0;
-	for(OptionList::const_iterator i=opts.begin(); i!=opts.end(); ++i)
+	if(compact)
+		result += " [options]";
+	else
 	{
-		result += " [";
-		if((*i)->get_short())
+		for(OptionList::const_iterator i=opts.begin(); i!=opts.end(); ++i)
 		{
-			result += format("-%c", (*i)->get_short());
+			result += " [";
+			if((*i)->get_short())
+			{
+				result += format("-%c", (*i)->get_short());
+				if(!(*i)->get_long().empty())
+					result += '|';
+				else if((*i)->get_arg_type()==OPTIONAL_ARG)
+					result += format("[%s]", (*i)->get_metavar());
+				else if((*i)->get_arg_type()==REQUIRED_ARG)
+					result += format(" %s", (*i)->get_metavar());
+			}
 			if(!(*i)->get_long().empty())
-				result += '|';
-			else if((*i)->get_arg_type()==OPTIONAL_ARG)
-				result += format("[%s]", (*i)->get_metavar());
-			else if((*i)->get_arg_type()==REQUIRED_ARG)
-				result += format(" %s", (*i)->get_metavar());
-		}
-		if(!(*i)->get_long().empty())
-		{
-			result += format("--%s", (*i)->get_long());
+			{
+				result += format("--%s", (*i)->get_long());
 
-			if((*i)->get_arg_type()==OPTIONAL_ARG)
-				result += format("[=%s]", (*i)->get_metavar());
-			else if((*i)->get_arg_type()==REQUIRED_ARG)
-				result += format("=%s", (*i)->get_metavar());
+				if((*i)->get_arg_type()==OPTIONAL_ARG)
+					result += format("[=%s]", (*i)->get_metavar());
+				else if((*i)->get_arg_type()==REQUIRED_ARG)
+					result += format("=%s", (*i)->get_metavar());
+			}
+			result += ']';
 		}
-		result += ']';
+	}
+
+	for(ArgumentList::const_iterator i=args.begin(); i!=args.end(); ++i)
+	{
+		result += ' ';
+		if((*i)->get_type()==OPTIONAL_ARG)
+			result += '[';
+		result += format("<%s>", (*i)->get_name());
+		if((*i)->is_list_store())
+			result += " ...";
+		if((*i)->get_type()==OPTIONAL_ARG)
+			result += ']';
 	}
 
 	return result;
@@ -218,16 +290,32 @@ string GetOpt::generate_help() const
 		maxw = max(maxw, swtch.size());
 	}
 
+	list<string> pargs;
+	for(ArgumentList::const_iterator i=args.begin(); i!=args.end(); ++i)
+	{
+		string parg = format("<%s>", (*i)->get_name());
+		pargs.push_back(parg);
+		maxw = max(maxw, parg.size());
+	}
+
 	string result;
+	result += "Options:\n";
 	list<string>::const_iterator j = switches.begin();
 	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());
-	
+	if(!pargs.empty())
+	{
+		result += "\nArguments:\n";
+		j = pargs.begin();
+		for(ArgumentList::const_iterator i=args.begin(); i!=args.end(); ++i, ++j)
+			result += format("  %s%s%s\n", *j, string(maxw+2-j->size(), ' '), (*i)->get_help());
+	}
+
 	return result;
 }
 
 
-GetOpt::OptionImpl::OptionImpl(char s, const std::string &l, const Store &t, ArgType a):
+GetOpt::OptionImpl::OptionImpl(char s, const string &l, const Store &t, ArgType a):
 	shrt(s),
 	lng(l),
 	arg_type(a),
@@ -299,4 +387,34 @@ void GetOpt::OptionImpl::process(const string &arg)
 	}
 }
 
+
+GetOpt::ArgumentImpl::ArgumentImpl(const string &n, const Store &t, ArgType a):
+	name(n),
+	type(a),
+	store(t.clone())
+{ }
+
+GetOpt::ArgumentImpl::~ArgumentImpl()
+{
+	delete store;
+}
+
+GetOpt::ArgumentImpl &GetOpt::ArgumentImpl::set_help(const string &h)
+{
+	help = h;
+	return *this;
+}
+
+void GetOpt::ArgumentImpl::process(const string &arg)
+{
+	try
+	{
+		store->store(arg);
+	}
+	catch(const exception &e)
+	{
+		throw usage_error("Invalid "+name+" ("+e.what()+")");
+	}
+}
+
 } // namespace Msp