From ea025ba2fc6d81a3c443b554c1749b55088261e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?BENEDEK=20L=C3=A1szl=C3=B3?= Date: Fri, 1 Dec 2023 15:22:58 +0100 Subject: [PATCH] formatting changes --- flags.cpp | 52 +++++++++++++++++---------------------- flags.h | 73 ++++++++++++++++++++++++++----------------------------- 2 files changed, 56 insertions(+), 69 deletions(-) diff --git a/flags.cpp b/flags.cpp index bffbbc3..9233ec0 100644 --- a/flags.cpp +++ b/flags.cpp @@ -1,10 +1,11 @@ #include "flags.h" -#include + #include +#include namespace Flags { -std::vector split(const std::string &input, const char separator) { +std::vector split(const std::string& input, const char separator) { std::vector result; std::istringstream stream(input); std::string part; @@ -14,8 +15,8 @@ std::vector split(const std::string &input, const char separator) { return result; } -bool starts_with(const std::string &input, const std::string &start) { - return (input.size() >= start.size() && input.substr(0, 2) == start); +bool starts_with(const std::string& input, const std::string& start) { + return (input.size() >= start.size() && input.substr(0, start.size()) == start); } PARSER(StringFlag, std::string, { @@ -29,7 +30,7 @@ PARSER(IntFlag, int, { try { value = std::stoi(arg); set_parsed(true); - } catch (std::exception &) { + } catch (std::exception&) { } }) @@ -38,7 +39,7 @@ PARSER(LongIntFlag, long int, { try { value = std::stol(arg); set_parsed(true); - } catch (std::exception &) { + } catch (std::exception&) { } }) @@ -47,7 +48,7 @@ PARSER(LongLongIntFlag, long long int, { try { value = std::stoll(arg); set_parsed(true); - } catch (std::exception &) { + } catch (std::exception&) { } }) @@ -56,7 +57,7 @@ PARSER(UnsignedLongIntFlag, unsigned long int, { try { value = std::stoul(arg); set_parsed(true); - } catch (std::exception &) { + } catch (std::exception&) { } }) @@ -65,7 +66,7 @@ PARSER(UnsignedLongLongIntFlag, unsigned long long int, { try { value = std::stoull(arg); set_parsed(true); - } catch (std::exception &) { + } catch (std::exception&) { } }) @@ -74,7 +75,7 @@ PARSER(FloatFlag, float, { try { value = std::stof(arg); set_parsed(true); - } catch (std::exception &) { + } catch (std::exception&) { } }) @@ -83,7 +84,7 @@ PARSER(DoubleFlag, double, { try { value = stod(arg); set_parsed(true); - } catch (std::exception &) { + } catch (std::exception&) { } }) @@ -92,36 +93,33 @@ PARSER(LongDoubleFlag, long double, { try { value = stold(arg); set_parsed(true); - } catch (std::exception &) { + } catch (std::exception&) { } }) PARSER(BoolFlag, bool, { std::string copy(arg); - std::transform(copy.begin(), copy.end(), copy.begin(), - [](const char c) { return std::tolower(c); }); + std::transform(copy.begin(), copy.end(), copy.begin(), [](const char c) { return std::tolower(c); }); if (copy == "false") value = false; else value = true; }) -Parser::Parser(const std::string &prefix, const std::string &help_text) - : prefix(prefix), help_text(help_text) { +Parser::Parser(const std::string& prefix, const std::string& help_text) : prefix(prefix), help_text(help_text) { set_parser(flag_constructor_t(StringFlag::make)); set_parser(flag_constructor_t(IntFlag::make)); set_parser(flag_constructor_t(LongIntFlag::make)); set_parser(flag_constructor_t(LongLongIntFlag::make)); set_parser(flag_constructor_t(UnsignedLongIntFlag::make)); - set_parser( - flag_constructor_t(UnsignedLongLongIntFlag::make)); + set_parser(flag_constructor_t(UnsignedLongLongIntFlag::make)); set_parser(flag_constructor_t(FloatFlag::make)); set_parser(flag_constructor_t(DoubleFlag::make)); set_parser(flag_constructor_t(LongDoubleFlag::make)); set_parser(flag_constructor_t(BoolFlag::make)); } -bool Parser::parse(int argc, char **argv) { +bool Parser::parse(int argc, char** argv) { // put each argument into a std::string std::vector args; for (int i = 0; i < argc; i++) { @@ -136,15 +134,14 @@ bool Parser::parse(int argc, char **argv) { // search for flags for (size_t i = 1; i < args.size() - 1; i++) { - const std::string &arg = args[i]; + const std::string& arg = args[i]; if (starts_with(arg, prefix) && arg.size() > prefix.size()) { flags[arg.substr(prefix.size())]->parse(args[i + 1]); } } // check for the last argument - if (starts_with(args[args.size() - 1], prefix) && - args[args.size() - 1].size() > prefix.size()) { + if (starts_with(args[args.size() - 1], prefix) && args[args.size() - 1].size() > prefix.size()) { flags[args[args.size() - 1].substr(prefix.size())]->parse(""); } @@ -152,23 +149,18 @@ bool Parser::parse(int argc, char **argv) { } unsigned Parser::get_parsed() const { - return std::count_if( - flags.begin(), flags.end(), - [](std::pair f) { return f.second->get_parsed(); }); + return std::count_if(flags.begin(), flags.end(), [](std::pair f) { return f.second->get_parsed(); }); } unsigned Parser::get_found() const { - return std::count_if( - flags.begin(), flags.end(), - [](std::pair f) { return f.second->get_found(); }); + return std::count_if(flags.begin(), flags.end(), [](std::pair f) { return f.second->get_found(); }); } void Parser::help() const { std::cout << help_text << std::endl; for (auto f : flags) { - std::cout << '\t' << prefix << f.first << ": " - << f.second->get_description() << std::endl; + std::cout << '\t' << prefix << f.first << ": " << f.second->get_description() << std::endl; } } } // namespace Flags \ No newline at end of file diff --git a/flags.h b/flags.h index a667a8a..c5c1574 100644 --- a/flags.h +++ b/flags.h @@ -9,8 +9,8 @@ namespace Flags { // utility functions -std::vector split(const std::string &input, const char separator); -bool starts_with(const std::string &input, const std::string &start); +std::vector split(const std::string& input, const char separator); +bool starts_with(const std::string& input, const std::string& start); // flag base class // should be abstract, don't use @@ -19,65 +19,62 @@ class Flag { bool found; bool parsed; -protected: + protected: void set_found(const bool found) { this->found = found; } void set_parsed(const bool parsed) { this->parsed = parsed; } -public: - virtual const void *get_value_ptr() const = 0; + public: + virtual const void* get_value_ptr() const = 0; - Flag(const std::string &description, const bool required) - : description(description), found(!required), parsed(false) {} + Flag(const std::string& description, const bool required) : description(description), found(!required), parsed(false) {} virtual ~Flag(){}; - const std::string &get_description() const { return description; } - bool get_found() const { return found; } + const std::string& get_description() const { return description; } bool get_parsed() const { return parsed; } + bool get_found() const { return found; } - virtual void parse(const std::string &arg) = 0; + virtual void parse(const std::string& arg) = 0; }; // type of flag based parser classes' factory functions -typedef std::function - flag_constructor_t; +typedef std::function flag_constructor_t; // use this class to create your own parser -template class FlagTemplate : public Flag { -protected: +template +class FlagTemplate : public Flag { + protected: T value; -public: - explicit FlagTemplate(const void *default_value, - const std::string &description, const bool required) - : Flag(description, required), value(*(T *)default_value) {} + public: + explicit FlagTemplate(const void* default_value, const std::string& description, const bool required) + : Flag(description, required), value(*(T*)default_value) {} - const void *get_value_ptr() const override { return &value; }; + const void* get_value_ptr() const override { return &value; }; }; -#define PARSER(name, type, func) \ - class name : public FlagTemplate { \ - using FlagTemplate::FlagTemplate; \ - \ - public: \ - static Flag *make(const void *default_value, \ - const std::string &description, const bool required) { \ - return new name(default_value, description, required); \ - } \ - void parse(const std::string &arg) override func \ +#define PARSER(name, type, func) \ + class name : public FlagTemplate { \ + using FlagTemplate::FlagTemplate; \ + \ + public: \ + static Flag* make(const void* default_value, const std::string& description, const bool required) { \ + return new name(default_value, description, required); \ + } \ + void parse(const std::string& arg) override func \ }; // namespace Flags // flag holder, parsing orchestrator class Parser { -private: + private: const std::string prefix; const std::string help_text; - std::map flags; + std::map flags; std::map constructors; -public: - Parser(const std::string &prefix, const std::string &help_text); + public: + Parser(const std::string& prefix, const std::string& help_text); Parser() : Parser("--", "Help:") {} @@ -93,18 +90,16 @@ public: } template - T *add(const std::string &name, const std::string &description, - const bool required, T default_value) { - flags[name] = - constructors[typeid(T)]((void *)&default_value, description, required); - return (T *)flags[name]->get_value_ptr(); + T* add(const std::string& name, const std::string& description, const bool required, T default_value) { + flags[name] = constructors[typeid(T)]((void*)&default_value, description, required); + return (T*)flags[name]->get_value_ptr(); } unsigned get_found() const; unsigned get_parsed() const; - bool parse(int argc, char **argv); + bool parse(int argc, char** argv); void help() const; };