tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove unsupported OptionsParser::Option::Type::OptionalArg.

Browse Source 
GitOrigin-RevId: 3226257bf95366472c843cce0e4ca76d3f3cee5c
This commit is contained in:
levlam 2020-06-16 18:11:32 +03:00
parent bd207a2d19
commit 4bb6fe7e78
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tdutils/td/utils/OptionsParser.cpp
View File

@ -17,7 +17,7 @@
namespace td { namespace td {
void OptionsParser::set_description(std::string description) { void OptionsParser::set_description(string description) {
description_ = std::move(description); description_ = std::move(description);
} }
@ -44,7 +44,6 @@ Result<int> OptionsParser::run(int argc, char *argv[]) {
char buff[1024]; char buff[1024];
StringBuilder sb(MutableSlice{buff, sizeof(buff)}); StringBuilder sb(MutableSlice{buff, sizeof(buff)});
for (auto &opt : options_) { for (auto &opt : options_) {
CHECK(opt.type != Option::Type::OptionalArg);
sb << opt.short_key; sb << opt.short_key;
if (opt.type == Option::Type::Arg) { if (opt.type == Option::Type::Arg) {
sb << ":"; sb << ":";
@ -112,15 +111,9 @@ StringBuilder &operator<<(StringBuilder &sb, const OptionsParser &o) {
if (!opt.long_key.empty()) { if (!opt.long_key.empty()) {
sb << "|--" << opt.long_key; sb << "|--" << opt.long_key;
} }
if (opt.type == OptionsParser::Option::Type::OptionalArg) {
sb << "[";
}
if (opt.type != OptionsParser::Option::Type::NoArg) { if (opt.type != OptionsParser::Option::Type::NoArg) {
sb << "<arg>"; sb << "<arg>";
} }
if (opt.type == OptionsParser::Option::Type::OptionalArg) {
sb << "]";
}
sb << "\t" << opt.description; sb << "\t" << opt.description;
sb << "\n"; sb << "\n";
} }

16
tdutils/td/utils/OptionsParser.h
View File

@ -18,20 +18,20 @@ namespace td {
class OptionsParser { class OptionsParser {
class Option { class Option {
public: public:
enum class Type { NoArg, Arg, OptionalArg }; enum class Type { NoArg, Arg };
Type type; Type type;
char short_key; char short_key;
std::string long_key; string long_key;
std::string description; string description;
std::function<Status(Slice)> arg_callback; std::function<Status(Slice)> arg_callback;
}; };
public:
void set_description(std::string description);
void add_option(Option::Type type, char short_key, Slice long_key, Slice description, void add_option(Option::Type type, char short_key, Slice long_key, Slice description,
std::function<Status(Slice)> callback); std::function<Status(Slice)> callback);
public:
void set_description(string description);
void add_option(char short_key, Slice long_key, Slice description, std::function<Status(Slice)> callback); void add_option(char short_key, Slice long_key, Slice description, std::function<Status(Slice)> callback);
void add_option(char short_key, Slice long_key, Slice description, std::function<Status(void)> callback); void add_option(char short_key, Slice long_key, Slice description, std::function<Status(void)> callback);
@ -41,8 +41,8 @@ class OptionsParser {
friend StringBuilder &operator<<(StringBuilder &sb, const OptionsParser &o); friend StringBuilder &operator<<(StringBuilder &sb, const OptionsParser &o);
private: private:
std::vector<Option> options_; vector<Option> options_;
std::string description_; string description_;
}; };
} // namespace td } // namespace td