From 8a75c0a2d6f57d572bff51b7235127fa97104220 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20W=C3=B6lzer?= <martin@libclapp.org> Date: Sat, 14 Sep 2024 12:34:07 +0200 Subject: [PATCH] src/clapp/parser.cpp: replaced static functions by functions in anonymous namespace --- src/clapp/parser.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/clapp/parser.cpp b/src/clapp/parser.cpp index 65048382..6e5f3868 100644 --- a/src/clapp/parser.cpp +++ b/src/clapp/parser.cpp @@ -22,14 +22,18 @@ #include <sstream> #include <utility> +namespace { + template <typename IT_T> -static clapp::parser::basic_parser_t::parse_result_t handle_parse_ret( +clapp::parser::basic_parser_t::parse_result_t handle_parse_ret( clapp::value::found_func_t::ret_t ret, IT_T pit); template <typename IT_T> -static std::optional<clapp::parser::basic_parser_t::parse_result_t> +std::optional<clapp::parser::basic_parser_t::parse_result_t> handle_parse_ret_or_nullopt(clapp::value::found_func_t::ret_t ret, IT_T pit); +} // namespace + clapp::parser::basic_parser_t::basic_parser_t() : basic_option_container_t{types::logic_operator_type_t::logic_and} {} @@ -340,8 +344,10 @@ void clapp::parser::basic_parser_t::validate_recursive() const { } } +namespace { + template <typename IT_T> -static clapp::parser::basic_parser_t::parse_result_t handle_parse_ret( +clapp::parser::basic_parser_t::parse_result_t handle_parse_ret( const clapp::value::found_func_t::ret_t ret, const IT_T pit) { if (ret) { return clapp::parser::basic_parser_t::parse_result_t{pit, std::nullopt, @@ -352,7 +358,7 @@ static clapp::parser::basic_parser_t::parse_result_t handle_parse_ret( } template <typename IT_T> -static std::optional<clapp::parser::basic_parser_t::parse_result_t> +std::optional<clapp::parser::basic_parser_t::parse_result_t> handle_parse_ret_or_nullopt(const clapp::value::found_func_t::ret_t ret, const IT_T pit) { if (ret) { @@ -362,6 +368,8 @@ handle_parse_ret_or_nullopt(const clapp::value::found_func_t::ret_t ret, return {}; } +} // namespace + clapp::parser::basic_parser_t::parse_result_t clapp::parser::basic_parser_t::parse_arg(const std::string_view argument, types::arg_iterator_t ait, -- GitLab