From 04539816b5e793afdcff991a28c298f199e709db Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Tue, 4 Oct 2016 14:46:40 -0700 Subject: Add another result when parsing package spec: has_invalid_characters --- toolsrc/include/package_spec_parse_result.h | 6 ++++-- toolsrc/src/package_spec_parse_result.cpp | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/toolsrc/include/package_spec_parse_result.h b/toolsrc/include/package_spec_parse_result.h index e59622951..bfb5e82f7 100644 --- a/toolsrc/include/package_spec_parse_result.h +++ b/toolsrc/include/package_spec_parse_result.h @@ -6,7 +6,8 @@ namespace vcpkg enum class package_spec_parse_result { success = 0, - too_many_colons + too_many_colons, + invalid_characters }; struct package_spec_parse_result_category_impl final : std::error_category @@ -30,5 +31,6 @@ namespace std { template <> struct is_error_code_enum : ::std::true_type - {}; + { + }; } diff --git a/toolsrc/src/package_spec_parse_result.cpp b/toolsrc/src/package_spec_parse_result.cpp index 757b6df53..6c6c28e21 100644 --- a/toolsrc/src/package_spec_parse_result.cpp +++ b/toolsrc/src/package_spec_parse_result.cpp @@ -17,6 +17,8 @@ namespace vcpkg return "OK"; case package_spec_parse_result::too_many_colons: return "Too many colons"; + case package_spec_parse_result::invalid_characters: + return "Contains invalid characters. Only alphanumeric ASCII characters and dashes are allowed"; default: Checks::unreachable(); } -- cgit v1.2.3