From e051edfa10a686490168f0e888297afb22a4b905 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Mon, 3 Apr 2017 16:00:17 -0700 Subject: vcpkg_cmd_arguments -> VcpkgCmdArguments --- toolsrc/include/VcpkgCmdArguments.h | 35 +++++++++++++++++++++++++ toolsrc/include/vcpkg_Commands.h | 48 +++++++++++++++++------------------ toolsrc/include/vcpkg_cmd_arguments.h | 35 ------------------------- 3 files changed, 59 insertions(+), 59 deletions(-) create mode 100644 toolsrc/include/VcpkgCmdArguments.h delete mode 100644 toolsrc/include/vcpkg_cmd_arguments.h (limited to 'toolsrc/include') diff --git a/toolsrc/include/VcpkgCmdArguments.h b/toolsrc/include/VcpkgCmdArguments.h new file mode 100644 index 000000000..4a0809fff --- /dev/null +++ b/toolsrc/include/VcpkgCmdArguments.h @@ -0,0 +1,35 @@ +#pragma once + +#include +#include +#include +#include "OptBool.h" + +namespace vcpkg +{ + struct VcpkgCmdArguments + { + static VcpkgCmdArguments create_from_command_line(const int argc, const wchar_t* const* const argv); + static VcpkgCmdArguments create_from_arg_sequence(const std::string* arg_begin, const std::string* arg_end); + + std::unique_ptr vcpkg_root_dir; + std::unique_ptr target_triplet; + OptBoolT debug = OptBoolT::UNSPECIFIED; + OptBoolT sendmetrics = OptBoolT::UNSPECIFIED; + OptBoolT printmetrics = OptBoolT::UNSPECIFIED; + + std::string command; + std::vector command_arguments; + std::unordered_set check_and_get_optional_command_arguments(const std::vector& valid_options) const; + + void check_max_arg_count(const size_t expected_arg_count) const; + void check_max_arg_count(const size_t expected_arg_count, const std::string& example_text) const; + void check_min_arg_count(const size_t expected_arg_count) const; + void check_min_arg_count(const size_t expected_arg_count, const std::string& example_text) const; + void check_exact_arg_count(const size_t expected_arg_count) const; + void check_exact_arg_count(const size_t expected_arg_count, const std::string& example_text) const; + + private: + std::unordered_set optional_command_arguments; + }; +} diff --git a/toolsrc/include/vcpkg_Commands.h b/toolsrc/include/vcpkg_Commands.h index 985657a94..b7e981b41 100644 --- a/toolsrc/include/vcpkg_Commands.h +++ b/toolsrc/include/vcpkg_Commands.h @@ -1,6 +1,6 @@ #pragma once -#include "vcpkg_cmd_arguments.h" +#include "VcpkgCmdArguments.h" #include "vcpkg_paths.h" #include "StatusParagraphs.h" #include @@ -8,9 +8,9 @@ namespace vcpkg::Commands { - using command_type_a = void(*)(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const Triplet& default_target_triplet); - using command_type_b = void(*)(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths); - using command_type_c = void(*)(const vcpkg_cmd_arguments& args); + using command_type_a = void(*)(const VcpkgCmdArguments& args, const vcpkg_paths& paths, const Triplet& default_target_triplet); + using command_type_b = void(*)(const VcpkgCmdArguments& args, const vcpkg_paths& paths); + using command_type_c = void(*)(const VcpkgCmdArguments& args); namespace Build { @@ -33,28 +33,28 @@ namespace vcpkg::Commands BuildResult build_package(const SourceParagraph& source_paragraph, const PackageSpec& spec, const vcpkg_paths& paths, const fs::path& port_dir, const StatusParagraphs& status_db); void perform_and_exit(const PackageSpec& spec, const fs::path& port_dir, const std::unordered_set& options, const vcpkg_paths& paths); - void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const Triplet& default_target_triplet); + void perform_and_exit(const VcpkgCmdArguments& args, const vcpkg_paths& paths, const Triplet& default_target_triplet); } namespace BuildExternal { - void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const Triplet& default_target_triplet); + void perform_and_exit(const VcpkgCmdArguments& args, const vcpkg_paths& paths, const Triplet& default_target_triplet); } namespace Install { void install_package(const vcpkg_paths& paths, const BinaryParagraph& binary_paragraph, StatusParagraphs* status_db); - void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const Triplet& default_target_triplet); + void perform_and_exit(const VcpkgCmdArguments& args, const vcpkg_paths& paths, const Triplet& default_target_triplet); } namespace CI { - void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const Triplet& default_target_triplet); + void perform_and_exit(const VcpkgCmdArguments& args, const vcpkg_paths& paths, const Triplet& default_target_triplet); } namespace Remove { - void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const Triplet& default_target_triplet); + void perform_and_exit(const VcpkgCmdArguments& args, const vcpkg_paths& paths, const Triplet& default_target_triplet); } namespace Update @@ -68,64 +68,64 @@ namespace vcpkg::Commands }; std::vector find_outdated_packages(const vcpkg_paths& paths, const StatusParagraphs& status_db); - void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths); + void perform_and_exit(const VcpkgCmdArguments& args, const vcpkg_paths& paths); } namespace Env { - void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const Triplet& default_triplet); + void perform_and_exit(const VcpkgCmdArguments& args, const vcpkg_paths& paths, const Triplet& default_triplet); } namespace Create { - void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths); + void perform_and_exit(const VcpkgCmdArguments& args, const vcpkg_paths& paths); } namespace Edit { - void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths); + void perform_and_exit(const VcpkgCmdArguments& args, const vcpkg_paths& paths); } namespace Search { - void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths); + void perform_and_exit(const VcpkgCmdArguments& args, const vcpkg_paths& paths); } namespace List { - void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths); + void perform_and_exit(const VcpkgCmdArguments& args, const vcpkg_paths& paths); } namespace Owns { - void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths); + void perform_and_exit(const VcpkgCmdArguments& args, const vcpkg_paths& paths); } namespace Cache { - void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths); + void perform_and_exit(const VcpkgCmdArguments& args, const vcpkg_paths& paths); } namespace Import { - void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths); + void perform_and_exit(const VcpkgCmdArguments& args, const vcpkg_paths& paths); } namespace Integrate { extern const char*const INTEGRATE_COMMAND_HELPSTRING; - void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths); + void perform_and_exit(const VcpkgCmdArguments& args, const vcpkg_paths& paths); } namespace PortsDiff { - void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths); + void perform_and_exit(const VcpkgCmdArguments& args, const vcpkg_paths& paths); } namespace Help { - void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths); + void perform_and_exit(const VcpkgCmdArguments& args, const vcpkg_paths& paths); void help_topic_valid_triplet(const vcpkg_paths& paths); @@ -139,18 +139,18 @@ namespace vcpkg::Commands namespace Version { const std::string& version(); - void perform_and_exit(const vcpkg_cmd_arguments& args); + void perform_and_exit(const VcpkgCmdArguments& args); } namespace Contact { const std::string& email(); - void perform_and_exit(const vcpkg_cmd_arguments& args); + void perform_and_exit(const VcpkgCmdArguments& args); } namespace Hash { - void perform_and_exit(const vcpkg_cmd_arguments& args); + void perform_and_exit(const VcpkgCmdArguments& args); } template diff --git a/toolsrc/include/vcpkg_cmd_arguments.h b/toolsrc/include/vcpkg_cmd_arguments.h deleted file mode 100644 index 6f06ad98d..000000000 --- a/toolsrc/include/vcpkg_cmd_arguments.h +++ /dev/null @@ -1,35 +0,0 @@ -#pragma once - -#include -#include -#include -#include "OptBool.h" - -namespace vcpkg -{ - struct vcpkg_cmd_arguments - { - static vcpkg_cmd_arguments create_from_command_line(const int argc, const wchar_t* const* const argv); - static vcpkg_cmd_arguments create_from_arg_sequence(const std::string* arg_begin, const std::string* arg_end); - - std::unique_ptr vcpkg_root_dir; - std::unique_ptr target_triplet; - OptBoolT debug = OptBoolT::UNSPECIFIED; - OptBoolT sendmetrics = OptBoolT::UNSPECIFIED; - OptBoolT printmetrics = OptBoolT::UNSPECIFIED; - - std::string command; - std::vector command_arguments; - std::unordered_set check_and_get_optional_command_arguments(const std::vector& valid_options) const; - - void check_max_arg_count(const size_t expected_arg_count) const; - void check_max_arg_count(const size_t expected_arg_count, const std::string& example_text) const; - void check_min_arg_count(const size_t expected_arg_count) const; - void check_min_arg_count(const size_t expected_arg_count, const std::string& example_text) const; - void check_exact_arg_count(const size_t expected_arg_count) const; - void check_exact_arg_count(const size_t expected_arg_count, const std::string& example_text) const; - - private: - std::unordered_set optional_command_arguments; - }; -} -- cgit v1.2.3