+
Skip to content

Add Positional Getters #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 20, 2020
Merged

Add Positional Getters #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
71fc8ce
Add getter for positional arguments
yahiaetman Mar 22, 2020
bf76215
Fixed "Boolean options return false if no value was specified in the …
yahiaetman Mar 22, 2020
65d1d3a
Changed the documentation for the positional getters.
yahiaetman Mar 22, 2020
27059c2
Applied google style to modifications.
yahiaetman Mar 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 47 additions & 0 deletions include/flags.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,43 @@ std::optional<bool> get(const argument_map& options,
return std::none_of(falsities.begin(), falsities.end(),
[&value](auto falsity) { return *value == falsity; });
}
if (options.find(option) != options.end()) return true;
return std::nullopt;
}

// Coerces the string value of the given positional index into <T>.
// If the value cannot be properly parsed or the key does not exist, returns
// nullopt.
template <class T>
std::optional<T> get(const std::vector<std::string_view>& positional_arguments,
size_t positional_index) {
if (positional_index < positional_arguments.size()) {
if (T value; std::istringstream(
std::string(positional_arguments[positional_index])) >>
value)
return value;
}
return std::nullopt;
}

// Since the values are already stored as strings, there's no need to use `>>`.
template <>
std::optional<std::string_view> get(
const std::vector<std::string_view>& positional_arguments,
size_t positional_index) {
if (positional_index < positional_arguments.size()) {
return positional_arguments[positional_index];
}
return std::nullopt;
}

template <>
std::optional<std::string> get(
const std::vector<std::string_view>& positional_arguments,
size_t positional_index) {
if (positional_index < positional_arguments.size()) {
return std::string(positional_arguments[positional_index]);
}
return std::nullopt;
}
} // namespace detail
Expand All @@ -144,6 +181,16 @@ struct args {
return get<T>(option).value_or(default_value);
}

template <class T>
std::optional<T> get(size_t positional_index) const {
return detail::get<T>(parser_.positional_arguments(), positional_index);
}

template <class T>
T get(size_t positional_index, T&& default_value) const {
return get<T>(positional_index).value_or(default_value);
}

const std::vector<std::string_view>& positional() const {
return parser_.positional_arguments();
}
Expand Down
43 changes: 42 additions & 1 deletion test/flags.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include "flags.h"

#include <array>
#include <mettle.hpp>
#include <stdexcept>
Expand Down Expand Up @@ -74,6 +75,8 @@ suite<> positional_arguments("positional arguments", [](auto& _) {
const auto fixture =
args_fixture::create({"--no", "positional", "--arguments"});
expect(fixture.args().positional().size(), equal_to(0));
expect(fixture.args().get<int>(0), equal_to(std::nullopt));
expect(fixture.args().get<int>(0, 3), equal_to(3));
});

// Testing the existence of positional arguments with no options or flags.
Expand All @@ -82,6 +85,15 @@ suite<> positional_arguments("positional arguments", [](auto& _) {
expect(fixture.args().positional().size(), equal_to(2));
expect(fixture.args().positional()[0], equal_to("positional"));
expect(fixture.args().positional()[1], equal_to("arguments"));
// Tests for positional getters
expect(fixture.args().get<std::string_view>(0), equal_to("positional"));
expect(fixture.args().get<std::string_view>(1), equal_to("arguments"));
expect(fixture.args().get<std::string_view>(2), equal_to(std::nullopt));
expect(fixture.args().get<std::string>(0, "default"),
equal_to("positional"));
expect(fixture.args().get<std::string>(1, "default"),
equal_to("arguments"));
expect(fixture.args().get<std::string>(2, "default"), equal_to("default"));
});

// Adding options to the mix.
Expand All @@ -91,6 +103,15 @@ suite<> positional_arguments("positional arguments", [](auto& _) {
expect(fixture.args().positional().size(), equal_to(2));
expect(fixture.args().positional()[0], equal_to("positional"));
expect(fixture.args().positional()[1], equal_to("arguments"));
// Tests for positional getters
expect(fixture.args().get<std::string_view>(0), equal_to("positional"));
expect(fixture.args().get<std::string_view>(1), equal_to("arguments"));
expect(fixture.args().get<std::string_view>(2), equal_to(std::nullopt));
expect(fixture.args().get<std::string>(0, "default"),
equal_to("positional"));
expect(fixture.args().get<std::string>(1, "default"),
equal_to("arguments"));
expect(fixture.args().get<std::string>(2, "default"), equal_to("default"));
});

// Adding flags to the mix.
Expand All @@ -101,6 +122,15 @@ suite<> positional_arguments("positional arguments", [](auto& _) {
expect(fixture.args().positional().size(), equal_to(2));
expect(fixture.args().positional()[0], equal_to("positional"));
expect(fixture.args().positional()[1], equal_to("arguments"));
// Tests for positional getters
expect(fixture.args().get<std::string_view>(0), equal_to("positional"));
expect(fixture.args().get<std::string_view>(1), equal_to("arguments"));
expect(fixture.args().get<std::string_view>(2), equal_to(std::nullopt));
expect(fixture.args().get<std::string>(0, "default"),
equal_to("positional"));
expect(fixture.args().get<std::string>(1, "default"),
equal_to("arguments"));
expect(fixture.args().get<std::string>(2, "default"), equal_to("default"));
});

// Adding both flags and options.
Expand All @@ -111,16 +141,27 @@ suite<> positional_arguments("positional arguments", [](auto& _) {
expect(fixture.args().positional().size(), equal_to(2));
expect(fixture.args().positional()[0], equal_to("positional"));
expect(fixture.args().positional()[1], equal_to("arguments"));
// Tests for positional getters
expect(fixture.args().get<std::string_view>(0), equal_to("positional"));
expect(fixture.args().get<std::string_view>(1), equal_to("arguments"));
expect(fixture.args().get<std::string_view>(2), equal_to(std::nullopt));
expect(fixture.args().get<std::string>(0, "default"),
equal_to("positional"));
expect(fixture.args().get<std::string>(1, "default"),
equal_to("arguments"));
expect(fixture.args().get<std::string>(2, "default"), equal_to("default"));
});
});

suite<> flag_parsing("flag parsing", [](auto& _) {
// Basic bool parsing.
_.test("bool", []() {
const auto fixture = args_fixture::create({"--foo", "1", "--bar", "no"});
const auto fixture =
args_fixture::create({"--foo", "1", "--bar", "no", "--verbose"});
expect(*fixture.args().get<bool>("foo"), equal_to(true));
expect(fixture.args().get<bool>("foo", false), equal_to(true));
expect(*fixture.args().get<bool>("bar"), equal_to(false));
expect(*fixture.args().get<bool>("verbose"), equal_to(true));
expect(fixture.args().get<bool>("nonexistent"), equal_to(std::nullopt));
});

Expand Down
点击 这是indexloc提供的php浏览器服务，不要输入任何密码和下载