From 264cd050e6280e5b87ec055e0a9d8985a7ba30b3 Mon Sep 17 00:00:00 2001
From: Daniel Shaw <t-dansha@microsoft.com>
Date: Mon, 5 Jun 2017 15:58:47 -0700
Subject: ExpectedT factory class

---
 toolsrc/include/SourceParagraph.h | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'toolsrc/include/SourceParagraph.h')

diff --git a/toolsrc/include/SourceParagraph.h b/toolsrc/include/SourceParagraph.h
index 19f558170..9874eb3a9 100644
--- a/toolsrc/include/SourceParagraph.h
+++ b/toolsrc/include/SourceParagraph.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "vcpkg_expected.h"
 #include <unordered_map>
 #include <vector>
 
@@ -15,14 +16,23 @@ namespace vcpkg
 
     const std::string& to_string(const Dependency& dep);
 
+    struct ParseControlErrorInfo
+    {
+        std::string name;
+        std::string remaining_fields_as_string;
+        std::string valid_fields_as_string;
+        std::error_code error;
+    };
+
     /// <summary>
     /// Port metadata (CONTROL file)
     /// </summary>
     struct SourceParagraph
     {
-        SourceParagraph();
+        static ExpectedT<SourceParagraph, ParseControlErrorInfo> parse_control_file(
+            std::unordered_map<std::string, std::string> fields);
 
-        explicit SourceParagraph(std::unordered_map<std::string, std::string> fields);
+        SourceParagraph();
 
         std::string name;
         std::string version;
@@ -31,6 +41,9 @@ namespace vcpkg
         std::vector<Dependency> depends;
     };
 
+    void print_error_message(const ParseControlErrorInfo& info);
+    void print_error_message(std::vector<ParseControlErrorInfo> error_info_list);
+
     std::vector<std::string> filter_dependencies(const std::vector<Dependency>& deps, const Triplet& t);
 
     std::vector<Dependency> expand_qualified_dependencies(const std::vector<std::string>& depends);
-- 
cgit v1.2.3


From cc443d1c6b10735f9e4e5d439432124ffcfb376f Mon Sep 17 00:00:00 2001
From: Daniel Shaw <t-dansha@microsoft.com>
Date: Mon, 5 Jun 2017 17:55:06 -0700
Subject: minor changes

---
 toolsrc/include/SourceParagraph.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'toolsrc/include/SourceParagraph.h')

diff --git a/toolsrc/include/SourceParagraph.h b/toolsrc/include/SourceParagraph.h
index 9874eb3a9..7b0fa3178 100644
--- a/toolsrc/include/SourceParagraph.h
+++ b/toolsrc/include/SourceParagraph.h
@@ -32,7 +32,7 @@ namespace vcpkg
         static ExpectedT<SourceParagraph, ParseControlErrorInfo> parse_control_file(
             std::unordered_map<std::string, std::string> fields);
 
-        SourceParagraph();
+        SourceParagraph() = default;
 
         std::string name;
         std::string version;
-- 
cgit v1.2.3


From 831f0631f7eea7aebad5fcce95c0bbf0e0cdff68 Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Tue, 6 Jun 2017 16:08:36 -0700
Subject: [vcpkg] Added parser support for 'Supports' field

---
 toolsrc/include/SourceParagraph.h | 37 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

(limited to 'toolsrc/include/SourceParagraph.h')

diff --git a/toolsrc/include/SourceParagraph.h b/toolsrc/include/SourceParagraph.h
index 7b0fa3178..a53158f3f 100644
--- a/toolsrc/include/SourceParagraph.h
+++ b/toolsrc/include/SourceParagraph.h
@@ -1,6 +1,9 @@
 #pragma once
 
+#include "vcpkg_System.h"
 #include "vcpkg_expected.h"
+
+#include <string>
 #include <unordered_map>
 #include <vector>
 
@@ -38,6 +41,7 @@ namespace vcpkg
         std::string version;
         std::string description;
         std::string maintainer;
+        std::vector<std::string> supports;
         std::vector<Dependency> depends;
     };
 
@@ -47,5 +51,36 @@ namespace vcpkg
     std::vector<std::string> filter_dependencies(const std::vector<Dependency>& deps, const Triplet& t);
 
     std::vector<Dependency> expand_qualified_dependencies(const std::vector<std::string>& depends);
-    std::vector<std::string> parse_depends(const std::string& depends_string);
+    std::vector<std::string> parse_comma_list(const std::string& str);
+
+    struct Supports
+    {
+        static ExpectedT<Supports, std::vector<std::string>> parse(const std::vector<std::string>& strs);
+
+        using Architecture = System::CPUArchitecture;
+
+        enum class Platform
+        {
+            WINDOWS,
+            UWP,
+        };
+        enum class Linkage
+        {
+            DYNAMIC,
+            STATIC,
+        };
+        enum class ToolsetVersion
+        {
+            V140,
+            V141,
+        };
+
+        bool supports(Architecture arch, Platform plat, Linkage crt, ToolsetVersion tools);
+
+    private:
+        std::vector<Architecture> architectures;
+        std::vector<Platform> platforms;
+        std::vector<Linkage> crt_linkages;
+        std::vector<ToolsetVersion> toolsets;
+    };
 }
-- 
cgit v1.2.3