From 8db6db5dac70c25b04cd4dd84392484dee822fbe Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Fri, 7 Feb 2020 11:24:35 -0800
Subject: [vcpkg] Further parser improvements (#9895)

* [vcpkg] Consolidate several internal parsers together (packagespecs + logicexpression + control) and enhance error messages

* [vcpkg] Migrate Build-Depends parsing to new framework

* [vcpkg] Fix tests. Re-enable underscores in feature names due to libwebp[vwebp_sdl] -- todo: rename this feature and remove underscores.
---
 toolsrc/include/vcpkg-test/mockcmakevarprovider.h | 4 ++--
 toolsrc/include/vcpkg-test/util.h                 | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'toolsrc/include/vcpkg-test')

diff --git a/toolsrc/include/vcpkg-test/mockcmakevarprovider.h b/toolsrc/include/vcpkg-test/mockcmakevarprovider.h
index 03defdcdd..21207c856 100644
--- a/toolsrc/include/vcpkg-test/mockcmakevarprovider.h
+++ b/toolsrc/include/vcpkg-test/mockcmakevarprovider.h
@@ -6,7 +6,7 @@ namespace vcpkg::Test
 {
     struct MockCMakeVarProvider : CMakeVars::CMakeVarProvider
     {
-        void load_generic_triplet_vars(const Triplet& triplet) const override { generic_triplet_vars[triplet] = {}; }
+        void load_generic_triplet_vars(Triplet triplet) const override { generic_triplet_vars[triplet] = {}; }
 
         void load_dep_info_vars(Span<const PackageSpec> specs) const override
         {
@@ -23,7 +23,7 @@ namespace vcpkg::Test
         }
 
         Optional<const std::unordered_map<std::string, std::string>&> get_generic_triplet_vars(
-            const Triplet& triplet) const override;
+            Triplet triplet) const override;
 
         Optional<const std::unordered_map<std::string, std::string>&> get_dep_info_vars(
             const PackageSpec& spec) const override;
diff --git a/toolsrc/include/vcpkg-test/util.h b/toolsrc/include/vcpkg-test/util.h
index 088a39b7d..d8ecc51ea 100644
--- a/toolsrc/include/vcpkg-test/util.h
+++ b/toolsrc/include/vcpkg-test/util.h
@@ -40,7 +40,7 @@ namespace vcpkg::Test
     {
         std::unordered_map<std::string, SourceControlFileLocation> map;
         Triplet triplet;
-        PackageSpecMap(const Triplet& t = Triplet::X86_WINDOWS) noexcept : triplet(t) {}
+        PackageSpecMap(Triplet t = Triplet::X86_WINDOWS) noexcept : triplet(t) {}
 
         PackageSpec emplace(const char* name,
                             const char* depends = "",
@@ -50,8 +50,6 @@ namespace vcpkg::Test
         PackageSpec emplace(vcpkg::SourceControlFileLocation&& scfl);
     };
 
-    vcpkg::PackageSpec unsafe_pspec(std::string name, vcpkg::Triplet t = vcpkg::Triplet::X86_WINDOWS);
-
     template<class T, class S>
     T&& unwrap(vcpkg::ExpectedT<T, S>&& p)
     {
-- 
cgit v1.2.3