Build help messages with format instead of ostringstream

diff --git a/source/core/getopt.cpp b/source/core/getopt.cpp
index b472c58b835a94e27fa94046c488e9777096b60f..cfc9d7a02fa99e547cc19afefecf6c32250691b3 100644 (file)
--- a/source/core/getopt.cpp
+++ b/source/core/getopt.cpp
@@ -1,3 +1,4 @@
+#include <msp/strings/format.h>

 #include "getopt.h"
 
 using namespace std;
 #include "getopt.h"
 
 using namespace std;


@@ -130,35 +131,33 @@ unsigned GetOpt::process_short(const char *const *argp)
 
 string GetOpt::generate_usage(const string &argv0) const
 {
 
 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)
        {
        for(list<OptBase *>::const_iterator i=opts.begin(); i!=opts.end(); ++i)
        {

-               line<<" [";
+               result += " [";

                if((*i)->get_short())
                {
                if((*i)->get_short())
                {

-                       line<<'-'<<(*i)->get_short();
+                       result += format("-%c", (*i)->get_short());

                        if(!(*i)->get_long().empty())
                        if(!(*i)->get_long().empty())

-                               line<<'|';
+                               result += '|';

                        else if((*i)->get_arg_type()==OPTIONAL_ARG)
                        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)
                        else if((*i)->get_arg_type()==REQUIRED_ARG)

-                               line<<' '<<(*i)->get_metavar();
+                               result += format(" %s", (*i)->get_metavar());

                }
                if(!(*i)->get_long().empty())
                {
                }
                if(!(*i)->get_long().empty())
                {

-                       line<<"--"<<(*i)->get_long();
+                       result += format("--%s", (*i)->get_long());

 
                        if((*i)->get_arg_type()==OPTIONAL_ARG)
 
                        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)
                        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
 }
 
 string GetOpt::generate_help() const


@@ -171,41 +170,36 @@ string GetOpt::generate_help() const
        list<string> switches;
        for(list<OptBase *>::const_iterator i=opts.begin(); i!=opts.end(); ++i)
        {
        list<string> switches;
        for(list<OptBase *>::const_iterator i=opts.begin(); i!=opts.end(); ++i)
        {

-               ostringstream swtch;
+               string swtch;

                if((*i)->get_short())
                {
                if((*i)->get_short())
                {

-                       swtch<<'-'<<(*i)->get_short();
+                       swtch += format("-%c", (*i)->get_short());

                        if(!(*i)->get_long().empty())
                        if(!(*i)->get_long().empty())

-                               swtch<<", ";
+                               swtch += ", ";

                        else if((*i)->get_arg_type()==OPTIONAL_ARG)
                        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)
                        else if((*i)->get_arg_type()==REQUIRED_ARG)

-                               swtch<<' '<<(*i)->get_metavar();
+                               swtch += format(" %s", (*i)->get_metavar());

                }
                else if(any_short)
                }
                else if(any_short)

-                       swtch<<"    ";
+                       swtch += "    ";

                if(!(*i)->get_long().empty())
                {
                if(!(*i)->get_long().empty())
                {

-                       swtch<<"--"<<(*i)->get_long();
+                       swtch += format("--%s", (*i)->get_long());

 
                        if((*i)->get_arg_type()==OPTIONAL_ARG)
 
                        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)
                        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)
        }
 
        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;
 }
        
        return result;
 }


@@ -217,7 +211,10 @@ GetOpt::OptBase::OptBase(char s, const std::string &l, ArgType a):
        arg_type(a),
        seen_count(0),
        metavar("ARG")
        arg_type(a),
        seen_count(0),
        metavar("ARG")

-{ }
+{
+       if(lng.empty())
+               throw invalid_argument("empty long option name");
+}

 
 GetOpt::OptBase &GetOpt::OptBase::set_help(const string &h)
 {
 
 GetOpt::OptBase &GetOpt::OptBase::set_help(const string &h)
 {