diff options
author | yuraaka <yuraaka@yandex-team.ru> | 2022-02-10 16:47:05 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:47:05 +0300 |
commit | 4230543261d7a38ef4dc14785ae0d45f2da43704 (patch) | |
tree | 7d5099e41a66d7501887488432100e3cfc69ea72 /library/cpp/getopt | |
parent | 8cac63f90980b825f78cbd01f45b396297047c2c (diff) | |
download | ydb-4230543261d7a38ef4dc14785ae0d45f2da43704.tar.gz |
Restoring authorship annotation for <yuraaka@yandex-team.ru>. Commit 1 of 2.
Diffstat (limited to 'library/cpp/getopt')
-rw-r--r-- | library/cpp/getopt/small/last_getopt_opts.h | 38 | ||||
-rw-r--r-- | library/cpp/getopt/small/last_getopt_parse_result.cpp | 20 | ||||
-rw-r--r-- | library/cpp/getopt/ut/last_getopt_ut.cpp | 24 |
3 files changed, 41 insertions, 41 deletions
diff --git a/library/cpp/getopt/small/last_getopt_opts.h b/library/cpp/getopt/small/last_getopt_opts.h index 825b99c8712..1361ad67313 100644 --- a/library/cpp/getopt/small/last_getopt_opts.h +++ b/library/cpp/getopt/small/last_getopt_opts.h @@ -43,7 +43,7 @@ namespace NLastGetopt { typedef TVector<TSimpleSharedPtr<TOpt>> TOptsVector; TOptsVector Opts_; // infomation about named (short and long) options - TVector<std::function<void(TStringBuf)>> ArgBindings_; + TVector<std::function<void(TStringBuf)>> ArgBindings_; EArgPermutation ArgPermutation_ = DEFAULT_ARG_PERMUTATION; // determines how to parse positions of named and free options. See information below. bool AllowSingleDashForLong_ = false; // @@ -245,22 +245,22 @@ namespace NLastGetopt { TOpt& AddOption(const TOpt& option); /** - * Creates new free argument handling - * @param name name of free arg to show in help - * @param target variable address to store parsing result into - * @param help help string to show in help - */ - template <typename T> - void AddFreeArgBinding(const TString& name, T& target, const TString& help = "") { - ArgBindings_.emplace_back([&target](TStringBuf value) { - target = FromString<T>(value); - }); - - FreeArgsMax_ = Max<ui32>(FreeArgsMax_, ArgBindings_.size()); - SetFreeArgTitle(ArgBindings_.size() - 1, name, help); - } - - /** + * Creates new free argument handling + * @param name name of free arg to show in help + * @param target variable address to store parsing result into + * @param help help string to show in help + */ + template <typename T> + void AddFreeArgBinding(const TString& name, T& target, const TString& help = "") { + ArgBindings_.emplace_back([&target](TStringBuf value) { + target = FromString<T>(value); + }); + + FreeArgsMax_ = Max<ui32>(FreeArgsMax_, ArgBindings_.size()); + SetFreeArgTitle(ArgBindings_.size() - 1, name, help); + } + + /** * Creates options list from string as in getopt(3) * * @param optstring source @@ -460,11 +460,11 @@ namespace NLastGetopt { /** * Set maximal number of free args * - * @param max new value + * @param max new value */ void SetFreeArgsMax(size_t max) { FreeArgsMax_ = ui32(max); - FreeArgsMax_ = Max<ui32>(FreeArgsMax_, ArgBindings_.size()); + FreeArgsMax_ = Max<ui32>(FreeArgsMax_, ArgBindings_.size()); } /** diff --git a/library/cpp/getopt/small/last_getopt_parse_result.cpp b/library/cpp/getopt/small/last_getopt_parse_result.cpp index f4b5607a909..d7230c2592c 100644 --- a/library/cpp/getopt/small/last_getopt_parse_result.cpp +++ b/library/cpp/getopt/small/last_getopt_parse_result.cpp @@ -126,16 +126,16 @@ namespace NLastGetopt { TOptParseResult& r = OptParseResult(); r.AddValue(Parser_->CurValOrOpt().data()); } - - Y_ENSURE(options); - const auto freeArgs = GetFreeArgs(); - for (size_t i = 0; i < freeArgs.size(); ++i) { - if (i >= options->ArgBindings_.size()) { - break; - } - - options->ArgBindings_[i](freeArgs[i]); - } + + Y_ENSURE(options); + const auto freeArgs = GetFreeArgs(); + for (size_t i = 0; i < freeArgs.size(); ++i) { + if (i >= options->ArgBindings_.size()) { + break; + } + + options->ArgBindings_[i](freeArgs[i]); + } } catch (...) { HandleError(); } diff --git a/library/cpp/getopt/ut/last_getopt_ut.cpp b/library/cpp/getopt/ut/last_getopt_ut.cpp index c99a1d053d1..9b6dcbbc270 100644 --- a/library/cpp/getopt/ut/last_getopt_ut.cpp +++ b/library/cpp/getopt/ut/last_getopt_ut.cpp @@ -779,16 +779,16 @@ Y_UNIT_TEST_SUITE(TLastGetoptTests) { TOptsParseResultException(&opts, Y_ARRAY_SIZE(argv), argv), TUsageException); } - - Y_UNIT_TEST(TestFreeArgsStoreResult) { - TOptsNoDefault opts; - TString data; - int number = 0; - opts.AddFreeArgBinding("data", data); - opts.AddFreeArgBinding("number", number); - TOptsParseResultTestWrapper r(&opts, V({"cmd", "hello", "25"})); - UNIT_ASSERT_VALUES_EQUAL("hello", data); - UNIT_ASSERT_VALUES_EQUAL(25, number); - UNIT_ASSERT_VALUES_EQUAL(2, r.GetFreeArgCount()); - } + + Y_UNIT_TEST(TestFreeArgsStoreResult) { + TOptsNoDefault opts; + TString data; + int number = 0; + opts.AddFreeArgBinding("data", data); + opts.AddFreeArgBinding("number", number); + TOptsParseResultTestWrapper r(&opts, V({"cmd", "hello", "25"})); + UNIT_ASSERT_VALUES_EQUAL("hello", data); + UNIT_ASSERT_VALUES_EQUAL(25, number); + UNIT_ASSERT_VALUES_EQUAL(2, r.GetFreeArgCount()); + } } |