From 773fbb10eb59c4e855eccf9966a6ef3a68e3e0c3 Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Thu, 20 Apr 2017 22:01:57 +0300
Subject: Get rid of variable struct

---
 bbot/manifest | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'bbot/manifest')

diff --git a/bbot/manifest b/bbot/manifest
index 3022535..087fd25 100644
--- a/bbot/manifest
+++ b/bbot/manifest
@@ -17,8 +17,6 @@
 
 #include <bbot/export>
 
-#include <bbot/variable>
-
 namespace bbot
 {
   using strings = std::vector<std::string>;
@@ -105,8 +103,12 @@ namespace bbot
 
     // Build system configuration variables (in addition to build environment
     // configuration variables).
+    // Note: could be quoted.
     //
-    variables config;
+    strings config;
+
+    strings
+    unquoted_config ();
 
     task_manifest (std::string nm,
                    bpkg::version vr,
@@ -114,7 +116,7 @@ namespace bbot
                    strings tr,
                    std::string mn,
                    butl::optional<butl::target_triplet> tg,
-                   variables cf)
+                   strings cf)
         : name (std::move (nm)),
           version (std::move (vr)),
           repository (std::move (rl)),
@@ -132,6 +134,13 @@ namespace bbot
 
     void
     serialize (butl::manifest_serializer&) const;
+
+    // Check that a string has the name=value format. The name must not
+    // contain spaces. Throw invalid_argument if the string doesn't conform to
+    // these rules.
+    //
+    static void
+    check_config (const std::string&);
   };
 
   class LIBBBOT_EXPORT task_response_manifest
-- 
cgit v1.1