From 9bf93c1ab73ee3cd2b763285fc5fc5456e972854 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Wed, 11 Jan 2017 10:14:23 +0200
Subject: Implement support for narrowing down tests (config.test)

---
 build2/config/utility.cxx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'build2/config/utility.cxx')

diff --git a/build2/config/utility.cxx b/build2/config/utility.cxx
index dac11c2..7a3fa9c 100644
--- a/build2/config/utility.cxx
+++ b/build2/config/utility.cxx
@@ -14,7 +14,7 @@ namespace build2
 {
   namespace config
   {
-    pair<const value*, bool>
+    pair<lookup, bool>
     omitted (scope& r, const variable& var)
     {
       // This is a stripped-down version of the required() twisted
@@ -44,12 +44,12 @@ namespace build2
       }
 
       if (l.defined () && current_mif->id == configure_id)
-          save_variable (r, var);
+        save_variable (r, var);
 
-      return pair<const value*, bool> (l.value, n);
+      return pair<lookup, bool> (l, n);
     }
 
-    const value&
+    lookup
     optional (scope& r, const variable& var)
     {
       if (current_mif->id == configure_id)
@@ -57,8 +57,8 @@ namespace build2
 
       auto l (r[var]);
       return l.defined ()
-        ? *l
-        : r.assign (var); // NULL.
+        ? l
+        : lookup (r.assign (var), r); // NULL.
     }
 
     bool
-- 
cgit v1.1