Skip to content

Commit 473a57b

Browse files
gen740gen740
committed
Add std
1 parent 32b767f commit 473a57b

File tree

6 files changed

+18
-19
lines changed

6 files changed

+18
-19
lines changed

‎Argo/ArgoHelpGenerator.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ template <class T>
5252
ARGO_ALWAYS_INLINE constexpr auto SubParserInfo(T subparsers) {
5353
std::vector<SubCommandInfo> ret{};
5454
if constexpr (!std::is_same_v<T, std::tuple<>>) {
55-
apply(
55+
std::apply(
5656
[&ret]<class... Parser>(Parser... parser) ARGO_ALWAYS_INLINE {
5757
(..., ret.emplace_back(parser.name.getKey(), parser.description));
5858
},

‎Argo/ArgoMetaAssigner.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ ARGO_ALWAYS_INLINE constexpr auto TupleAssign(
5555
std::tuple<T...>& t, const std::span<std::string_view>& v,
5656
std::index_sequence<N...> /* unused */, const std::string_view& key)
5757
-> void {
58-
((get<N>(t) = ArgCaster<std::remove_cvref_t<decltype(get<N>(t))>>(v[N], key)),
58+
((std::get<N>(t) = ArgCaster<std::remove_cvref_t<decltype(get<N>(t))>>(v[N], key)),
5959
...);
6060
}
6161

‎Argo/ArgoMetaLookup.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ ARGO_ALWAYS_INLINE constexpr auto GetkeyFromShortKey(char key)
3131
return false;
3232
}() || ...);
3333
}(make_type_sequence_t<Arguments>())) [[likely]] {
34-
return make_tuple(name, is_flag);
34+
return std::make_tuple(name, is_flag);
3535
}
3636
throw ParserInternalError("Fail to lookup");
3737
}

‎Argo/ArgoParser.cc

+4-4
Original file line numberDiff line numberDiff line change
@@ -266,12 +266,12 @@ class Parser {
266266
} else {
267267
static_assert(SearchIndex<Args, Name>() != -1,
268268
"Argument does not exist");
269-
return std::remove_cvref_t<decltype(get<SearchIndex<Args, Name>()>(
269+
return std::remove_cvref_t<decltype(std::get<SearchIndex<Args, Name>()>(
270270
std::declval<Args>()))>::value;
271271
}
272272
} else {
273273
static_assert(SearchIndex<Args, Name>() != -1, "Argument does not exist");
274-
return std::remove_cvref_t<decltype(get<SearchIndex<Args, Name>()>(
274+
return std::remove_cvref_t<decltype(std::get<SearchIndex<Args, Name>()>(
275275
std::declval<Args>()))>::value;
276276
}
277277
}
@@ -283,7 +283,7 @@ class Parser {
283283
}
284284
static_assert(!(SearchIndex<SubParsers, Name>() == -1),
285285
"Could not find subparser");
286-
return get<SearchIndex<SubParsers, Name>()>(subParsers).parser.get();
286+
return std::get<SearchIndex<SubParsers, Name>()>(subParsers).parser.get();
287287
}
288288

289289
template <ArgName Name>
@@ -307,7 +307,7 @@ class Parser {
307307
template <ArgName Name, class T>
308308
ARGO_ALWAYS_INLINE constexpr auto addParser(T& sub_parser,
309309
Description description = {""}) {
310-
auto s = make_tuple(
310+
auto s = std::make_tuple(
311311
SubParser<Name, T>{ref(sub_parser), description.description});
312312
auto sub_parsers = std::tuple_cat(subParsers, s);
313313
return Parser<ID, Args, PArgs, HArg, decltype(sub_parsers)>(

‎Argo/StdModule.cc

+2-3
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ module;
2525
export module Argo:std_module;
2626

2727
// NOLINTBEGIN(misc-unused-*-decls, cert-dcl58-cpp)
28-
using ::isatty;
28+
export using ::isatty;
2929

30-
namespace std {
30+
export namespace std {
3131
using ::std::exit;
3232

3333
// utility
@@ -36,7 +36,6 @@ using ::std::operator==;
3636
using ::std::operator+;
3737
using ::std::begin;
3838
using ::std::end;
39-
using ::std::exchange;
4039
using ::std::forward;
4140
using ::std::move;
4241

‎include/Argo/Argo.hh

+9-9
Original file line numberDiff line numberDiff line change
@@ -800,7 +800,7 @@ template <class T>
800800
ARGO_ALWAYS_INLINE constexpr auto SubParserInfo(T subparsers) {
801801
std::vector<SubCommandInfo> ret{};
802802
if constexpr (!std::is_same_v<T, std::tuple<>>) {
803-
apply(
803+
std::apply(
804804
[&ret]<class... Parser>(Parser... parser) ARGO_ALWAYS_INLINE {
805805
(..., ret.emplace_back(parser.name.getKey(), parser.description));
806806
},
@@ -831,7 +831,7 @@ ARGO_ALWAYS_INLINE constexpr auto GetkeyFromShortKey(char key)
831831
return false;
832832
}() || ...);
833833
}(make_type_sequence_t<Arguments>())) [[likely]] {
834-
return make_tuple(name, is_flag);
834+
return std::make_tuple(name, is_flag);
835835
}
836836
throw ParserInternalError("Fail to lookup");
837837
}
@@ -919,7 +919,7 @@ ARGO_ALWAYS_INLINE constexpr auto TupleAssign(
919919
std::tuple<T...>& t, const std::span<std::string_view>& v,
920920
std::index_sequence<N...> /* unused */, const std::string_view& key)
921921
-> void {
922-
((get<N>(t) = ArgCaster<std::remove_cvref_t<decltype(get<N>(t))>>(v[N], key)),
922+
((std::get<N>(t) = ArgCaster<std::remove_cvref_t<decltype(get<N>(t))>>(v[N], key)),
923923
...);
924924
}
925925

@@ -1181,7 +1181,7 @@ template <class SubParsers>
11811181
requires(is_tuple_v<SubParsers>)
11821182
ARGO_ALWAYS_INLINE constexpr auto MetaParse(SubParsers sub_parsers, int index,
11831183
int argc, char** argv) -> bool {
1184-
return apply(
1184+
return std::apply(
11851185
[&](auto&&... s) ARGO_ALWAYS_INLINE {
11861186
std::int64_t idx = -1;
11871187
return (... || (idx++, idx == index &&
@@ -1195,7 +1195,7 @@ template <class SubParsers>
11951195
ARGO_ALWAYS_INLINE constexpr auto ParserIndex(SubParsers sub_parsers, //
11961196
std::string_view key)
11971197
-> std::int64_t {
1198-
return apply(
1198+
return std::apply(
11991199
[&](auto&&... s) ARGO_ALWAYS_INLINE {
12001200
std::int64_t index = -1;
12011201
bool found = (... || (index++, s.name.getKey() == key));
@@ -1458,12 +1458,12 @@ class Parser {
14581458
} else {
14591459
static_assert(SearchIndex<Args, Name>() != -1,
14601460
"Argument does not exist");
1461-
return std::remove_cvref_t<decltype(get<SearchIndex<Args, Name>()>(
1461+
return std::remove_cvref_t<decltype(std::get<SearchIndex<Args, Name>()>(
14621462
std::declval<Args>()))>::value;
14631463
}
14641464
} else {
14651465
static_assert(SearchIndex<Args, Name>() != -1, "Argument does not exist");
1466-
return std::remove_cvref_t<decltype(get<SearchIndex<Args, Name>()>(
1466+
return std::remove_cvref_t<decltype(std::get<SearchIndex<Args, Name>()>(
14671467
std::declval<Args>()))>::value;
14681468
}
14691469
}
@@ -1475,7 +1475,7 @@ class Parser {
14751475
}
14761476
static_assert(!(SearchIndex<SubParsers, Name>() == -1),
14771477
"Could not find subparser");
1478-
return get<SearchIndex<SubParsers, Name>()>(subParsers).parser.get();
1478+
return std::get<SearchIndex<SubParsers, Name>()>(subParsers).parser.get();
14791479
}
14801480

14811481
template <ArgName Name>
@@ -1499,7 +1499,7 @@ class Parser {
14991499
template <ArgName Name, class T>
15001500
ARGO_ALWAYS_INLINE constexpr auto addParser(T& sub_parser,
15011501
Description description = {""}) {
1502-
auto s = make_tuple(
1502+
auto s = std::make_tuple(
15031503
SubParser<Name, T>{ref(sub_parser), description.description});
15041504
auto sub_parsers = std::tuple_cat(subParsers, s);
15051505
return Parser<ID, Args, PArgs, HArg, decltype(sub_parsers)>(

0 commit comments

Comments
 (0)