Replace earlier options sharing the same short or long name

[libs/core.git] / source / core / getopt.h

diff --git a/source/core/getopt.h b/source/core/getopt.h
index bb1bd1568f6dff403843e6bd57492bc0832fb21d..a3b7ae405ec567c4d9b0fb6a8966d89bed4fb689 100644 (file)
--- a/source/core/getopt.h
+++ b/source/core/getopt.h
@@ -1,10 +1,3 @@
-/* $Id$
-
-This file is part of libmspcore
-Copyright © 2006-2009, 2011 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_CORE_GETOPT_H_
 #define MSP_CORE_GETOPT_H_
 
@@ -72,6 +65,9 @@ private:
        template<typename T>
        class Option: public OptBase
        {
+       private:
+               T &data;
+
        public:
                Option(char s, const std::string &l, T &d, ArgType a): OptBase(s, l, a), data(d) { }
 
@@ -88,13 +84,14 @@ private:
                                throw usage_error("Invalid argument for --"+lng+" ("+e.what()+")");
                        }
                }
-       private:
-               T &data;
        };
 
        template<typename T>
        class ListOption: public OptBase
        {
+       private:
+               T &data;
+
        public:
                ListOption(char s, const std::string &l, T &d, ArgType a): OptBase(s, l, a), data(d)
                { if(arg_type!=REQUIRED_ARG) throw std::invalid_argument("ListOption arg_type!=REQUIRED"); }
@@ -112,8 +109,6 @@ private:
                                throw usage_error("Invalid argument for --"+lng+" ("+e.what()+")");
                        }
                }
-       private:
-               T &data;
        };
 
        bool help;
@@ -128,17 +123,19 @@ public:
 
        template<typename T>
        OptBase &add_option(char s, const std::string &l, T &d, ArgType a = NO_ARG)
-       { opts.push_back(new Option<T>(s, l, d, a)); return *opts.back(); }
+       { return add_option(new Option<T>(s, l, d, a)); }
        
        template<typename T>
        OptBase &add_option(char s, const std::string &l, std::list<T> &d, ArgType a = REQUIRED_ARG)
-       { opts.push_back(new ListOption<std::list<T> >(s, l, d, a)); return *opts.back(); }
+       { return add_option(new ListOption<std::list<T> >(s, l, d, a)); }
        
        template<typename T>
        OptBase &add_option(const std::string &l, T &d, ArgType a)
        { return add_option(0, l, d, a); }
 
 private:
+       OptBase &add_option(OptBase *);
+
        OptBase &get_option(char);
        OptBase &get_option(const std::string &);
 
@@ -163,8 +160,11 @@ public:
        std::string generate_help() const;
 };
 
-template<> inline void GetOpt::Option<bool>::store()     { data = true; }
-template<> inline void GetOpt::Option<unsigned>::store() { ++data; }
+template<> inline void GetOpt::Option<bool>::store()
+{ data = true; }
+
+template<> inline void GetOpt::Option<unsigned>::store()
+{ ++data; }
 
 template<> inline void GetOpt::Option<std::string>::store(const std::string &a)
 { data = a; }