From d90ac405ae50f84a3cf4ba0b806cca1c89f81cff Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Thu, 26 Jul 2018 14:12:56 +0300
Subject: Make project variable to be of project_name type

---
 build2/version/init.cxx | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'build2/version/init.cxx')

diff --git a/build2/version/init.cxx b/build2/version/init.cxx
index 397d7da..4234451 100644
--- a/build2/version/init.cxx
+++ b/build2/version/init.cxx
@@ -138,10 +138,18 @@ namespace build2
                 catch (const invalid_argument& e)
                 {
                   fail (l) << "invalid version constraint for dependency "
-                           << b << ": " << e;
+                           << d << ": " << e;
                 }
 
-                ds.emplace (move (n), move (c));
+                try
+                {
+                  ds.emplace (project_name (move (n)).variable (), move (c));
+                }
+                catch (const invalid_argument& e)
+                {
+                  fail (l) << "invalid package name for dependency "
+                           << d << ": " << e;
+                }
               }
             }
           }
@@ -232,7 +240,7 @@ namespace build2
 
       // Create the module.
       //
-      mod.reset (new module (cast<string> (rs.vars[var_project]),
+      mod.reset (new module (cast<project_name> (rs.vars[var_project]),
                              move (v),
                              committed,
                              rewritten,
@@ -284,7 +292,7 @@ namespace build2
 
         if (!val)
         {
-          string p (cast<string> (rs.vars[var_project]));
+          string p (cast<project_name> (rs.vars[var_project]).string ());
           p += '-';
           p += v.string ();
           val = move (p);
-- 
cgit v1.1