1 files changed, 33 insertions, 17 deletions

diff --git a/libbuild2/variable.ixx b/libbuild2/variable.ixx
index a84c012..51c35fd 100644
--- a/libbuild2/variable.ixx
+++ b/libbuild2/variable.ixx
@@ -224,7 +224,7 @@ namespace build2
 
   template <typename T>
   inline const T&
-  cast (const lookup& l)
+  cast (lookup l)
   {
     return cast<T> (*l);
   }
@@ -245,7 +245,7 @@ namespace build2
 
   template <typename T>
   inline const T*
-  cast_null (const lookup& l)
+  cast_null (lookup l)
   {
     return l ? &cast<T> (*l) : nullptr;
   }
@@ -259,7 +259,7 @@ namespace build2
 
   template <typename T>
   inline const T&
-  cast_empty (const lookup& l)
+  cast_empty (lookup l)
   {
     return l ? cast<T> (l) : value_traits<T>::empty_instance;
   }
@@ -273,7 +273,7 @@ namespace build2
 
   template <typename T>
   inline T
-  cast_default (const lookup& l, const T& d)
+  cast_default (lookup l, const T& d)
   {
     return l ? cast<T> (l) : d;
   }
@@ -287,7 +287,7 @@ namespace build2
 
   template <typename T>
   inline T
-  cast_false (const lookup& l)
+  cast_false (lookup l)
   {
     return l && cast<T> (l);
   }
@@ -301,7 +301,7 @@ namespace build2
 
   template <typename T>
   inline T
-  cast_true (const lookup& l)
+  cast_true (lookup l)
   {
     return !l || cast<T> (l);
   }
@@ -326,18 +326,21 @@ namespace build2
   }
 
   inline vector_view<const name>
-  reverse (const value& v, names& storage)
+  reverse (const value& v, names& storage, bool reduce)
   {
     assert (v &&
             storage.empty () &&
             (v.type == nullptr || v.type->reverse != nullptr));
-    return v.type == nullptr ? v.as<names> () : v.type->reverse (v, storage);
+
+    return v.type == nullptr
+      ? v.as<names> ()
+      : v.type->reverse (v, storage, reduce);
   }
 
   inline vector_view<name>
-  reverse (value& v, names& storage)
+  reverse (value& v, names& storage, bool reduce)
   {
-    names_view cv (reverse (static_cast<const value&> (v), storage));
+    names_view cv (reverse (static_cast<const value&> (v), storage, reduce));
     return vector_view<name> (const_cast<name*> (cv.data ()), cv.size ());
   }
 
@@ -905,6 +908,26 @@ namespace build2
 
   // variable_pool
   //
+  inline const variable* variable_pool::
+  find (const string& n) const
+  {
+    // The pool chaining semantics for lookup: first check own pool then, if
+    // not found, check the outer pool.
+    //
+    auto i (map_.find (&n));
+    if (i != map_.end ())
+      return &i->second;
+
+    if (outer_ != nullptr)
+    {
+      i = outer_->map_.find (&n);
+      if (i != outer_->map_.end ())
+        return &i->second;
+    }
+
+    return nullptr;
+  }
+
   inline const variable& variable_pool::
   operator[] (const string& n) const
   {
@@ -913,13 +936,6 @@ namespace build2
     return *r;
   }
 
-  inline const variable* variable_pool::
-  find (const string& n) const
-  {
-    auto i (map_.find (&n));
-    return i != map_.end () ? &i->second : nullptr;
-  }
-
   // variable_map
   //
   inline void variable_map::