Skip to content

Commit

Permalink
some light refactoring.
Browse files Browse the repository at this point in the history
  • Loading branch information
mabruzzo committed Sep 18, 2024
1 parent 75393de commit 54fb3c2
Showing 1 changed file with 9 additions and 32 deletions.
41 changes: 9 additions & 32 deletions src/grcli/handle_gr_parameters.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ using value_variant = std::variant<int, double, std::string>;
/// receives. If the order within argv, this becomes invalidated. Likewise
/// this would also become invalidated, if argv were somehow deallocated...
struct CliParamSpec{
const char* const * begin;
const char* const * end;
std::vector<const char*> args;

private:
/// internal type used to hold the parsed key-value pair
Expand Down Expand Up @@ -55,8 +54,8 @@ struct CliParamSpec{
/// arguments (std::string_view key, value_variant value)
template<class PairFn>
void for_each(PairFn f) const {
for(const char* const* ptr = this->begin; ptr != end; ++ptr) {
KVPair kv_pair = this->parse_param_(*ptr);
for(const char* arg : args) {
KVPair kv_pair = this->parse_param_(arg);
f(kv_pair.key, kv_pair.val);
}
}
Expand All @@ -73,35 +72,13 @@ struct CliParamSpec{
inline bool try_parse_cli_paramspec(const char* leading_arg,
CliParser& parser,
std::optional<CliParamSpec>& param_spec) {
if (std::string_view(leading_arg) != "--par-start") {
return false;
} else if (param_spec.has_value()) {
std::fprintf(stderr, "%s isn't allowed to be provided more than once\n",
leading_arg);
std::exit(1);
}

const std::string_view sentinel("--par-stop");
if ((not parser.has_next()) || (parser.peek() == sentinel)) {
fprintf(stderr, "the \"%s\" flag doesn't start a group of parameters\n",
leading_arg);
std::exit(1);

} else {
char * const * begin = parser.next_argv_ptr();
char * const * latest = begin;
while (sentinel != *latest) {
if (!parser.has_next()) {
latest++;
break;
}
latest = parser.next_argv_ptr();
}
args::EscapedArgsSpec arg_spec{'P', "--par-start", "--par-stop"};

CliParamSpec tmp{begin, latest};
param_spec = std::make_optional<CliParamSpec>(std::move(tmp));
return true;
}
auto fn = [&param_spec](const char* arg) -> void {
if (!param_spec.has_value()) { param_spec = CliParamSpec{}; }
param_spec.value().args.push_back(arg);
};
return arg_spec.try_parse(leading_arg, parser, fn);
}

/// Class that holds the full configuration of the Grackle-Solver
Expand Down

0 comments on commit 54fb3c2

Please sign in to comment.