Remove type aliases

Author: dimitry-ishenko

args.hpp

@@ -20,12 +20,6 @@
 namespace pgm
 {
 
-// pull in often-used names from std::
-using std::move;
-using std::size_t;
-using std::string;
-using std::string_view;
-
 ////////////////////////////////////////////////////////////////////////////////
 // parsed values for an option or positional parameter
 struct argval
@@ -37,15 +31,15 @@ struct argval
 
     auto const& values() const { return data_; }
     auto const& value() const { return data_.at(0); }
-    auto const& value(size_t n) const { return data_.at(n); }
+    auto const& value(std::size_t n) const { return data_.at(n); }
 
-    auto value_or(string_view def) const { return empty() ? string{def} : value(); }
+    auto value_or(std::string_view def) const { return empty() ? std::string{def} : value(); }
 
 private:
-    std::vector<string> data_;
+    std::vector<std::string> data_;
 
     friend class args;
-    void add(string val) { data_.push_back(move(val)); }
+    void add(std::string val) { data_.push_back(std::move(val)); }
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -64,48 +58,48 @@ constexpr auto operator|(spec lhs, spec rhs);
 // program option
 struct option
 {
-    string short_;          // short option name
-    string long_;           // long option name
-    string valname_;        // name of the option value; eg, --opt-name=<value>
-    string description_;    // description
+    std::string short_;       // short option name
+    std::string long_;        // long option name
+    std::string valname_;     // name of the option value; eg, --opt-name=<value>
+    std::string description_; // description
 
-    bool req_ = false;      // mandatory (required) option
-    bool mul_ = false;      // can be specified multiple times
-    bool optval_ = false;   // option value is optional
+    bool req_ = false;        // mandatory (required) option
+    bool mul_ = false;        // can be specified multiple times
+    bool optval_ = false;     // option value is optional
 
-    argval values_;         // parsed value(s)
+    argval values_;           // parsed value(s)
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // positional parameter
 struct param
 {
-    string name_;           // param name
-    string description_;    // description
+    std::string name_;        // param name
+    std::string description_; // description
 
-    bool opt_ = false;      // optional param
-    bool mul_ = false;      // can be specified multiple times
+    bool opt_ = false;        // optional param
+    bool mul_ = false;        // can be specified multiple times
 
-    argval values_;         // parsed value(s)
+    argval values_;           // parsed value(s)
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // program argument (either option or param)
 struct arg
 {
-    arg(string name1, string description) :
-        arg{move(name1), spec{ }, move(description)}
+    arg(std::string name1, std::string description) :
+        arg{std::move(name1), spec{ }, std::move(description)}
     { }
-    arg(string name1, string name2, string description) :
-        arg{move(name1), move(name2), spec{ }, move(description)}
+    arg(std::string name1, std::string name2, std::string description) :
+        arg{std::move(name1), std::move(name2), spec{ }, std::move(description)}
     { }
-    arg(string name1, string name2, string name3, string description) :
-        arg{move(name1), move(name2), move(name3), spec{ }, move(description)}
+    arg(std::string name1, std::string name2, std::string name3, std::string description) :
+        arg{std::move(name1), std::move(name2), std::move(name3), spec{ }, std::move(description)}
     { }
 
-    arg(string name1, spec, string description);
-    arg(string name1, string name2, spec, string description);
-    arg(string name1, string name2, string name3, spec, string description);
+    arg(std::string name1, spec, std::string description);
+    arg(std::string name1, std::string name2, spec, std::string description);
+    arg(std::string name1, std::string name2, std::string name3, spec, std::string description);
 
     auto is_option() const { return std::holds_alternative<option>(val_); }
     auto is_param() const { return std::holds_alternative<param>(val_); }
@@ -124,18 +118,18 @@ struct args
     args() = default;
     explicit args(std::initializer_list<arg> il)
     {
-        for(auto& el : il) add(move(el));
+        for(auto& el : il) add(std::move(el));
     }
 
     void add(arg);
 
     template<typename... Ts>
     void add(Ts&&... vs) { add(arg{ std::forward<Ts>(vs)... }); }
 
-    argval const& operator[](string_view) const;
+    argval const& operator[](std::string_view) const;
 
     void parse(int argc, char* argv[]);
-    string usage(string_view program, string_view preamble = { }, string_view prologue = { }, string_view epilogue = { }) const;
+    std::string usage(std::string_view program, std::string_view preamble = { }, std::string_view prologue = { }, std::string_view epilogue = { }) const;
 
 private:
     std::vector<option> options_;
@@ -148,28 +142,28 @@ struct args
 ////////////////////////////////////////////////////////////////////////////////
 struct argument_exception : std::invalid_argument
 {
-    argument_exception(string_view what, string_view why) :
-        std::invalid_argument{string{what}+": "+string{why}+"."}
+    argument_exception(std::string_view what, std::string_view why) :
+        std::invalid_argument{std::string{what}+": "+std::string{why}+"."}
     { }
 };
 
 struct invalid_definition : argument_exception
 {
-    invalid_definition(string_view why) :
+    invalid_definition(std::string_view why) :
         argument_exception{"Invalid definition", why}
     { }
 };
 
 struct invalid_argument : argument_exception
 {
-    invalid_argument(string_view why) :
+    invalid_argument(std::string_view why) :
         argument_exception{"Invalid argument", why}
     { }
 };
 
 struct missing_argument : argument_exception
 {
-    missing_argument(string_view why) :
+    missing_argument(std::string_view why) :
         argument_exception{"Missing argument", why}
     { }
 };