aboutsummaryrefslogtreecommitdiff
path: root/libbuild2/config/utility.txx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2020-03-11 12:05:37 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2020-03-11 12:05:37 +0200
commit42257647f90d9180cfbc5b20f8b1b7a0ffef7e26 (patch)
tree909d8d327883af5da3ddce8ed6a00e6fa62f7aab /libbuild2/config/utility.txx
parent891d13075769cbe1c50be3acd191359490b0af9a (diff)
Minor config variable lookup cleanups
Diffstat (limited to 'libbuild2/config/utility.txx')
-rw-r--r--libbuild2/config/utility.txx22
1 files changed, 11 insertions, 11 deletions
diff --git a/libbuild2/config/utility.txx b/libbuild2/config/utility.txx
index b5d2174..670a701 100644
--- a/libbuild2/config/utility.txx
+++ b/libbuild2/config/utility.txx
@@ -10,17 +10,17 @@ namespace build2
{
template <typename T>
pair<lookup, bool>
- required (scope& root,
+ required (scope& rs,
const variable& var,
T&& def_val,
bool def_ovr,
- uint64_t save_flags)
+ uint64_t sflags)
{
// Note: see also omitted() if changing anything here.
- save_variable (root, var, save_flags);
+ save_variable (rs, var, sflags);
- pair<lookup, size_t> org (root.find_original (var));
+ pair<lookup, size_t> org (rs.find_original (var));
bool n (false); // New flag.
lookup l (org.first);
@@ -31,23 +31,23 @@ namespace build2
// are going to do is first ignore overrides and perform the normal
// logic on the original. Then we apply the overrides on the result.
//
- if (!l.defined () || (def_ovr && !l.belongs (root)))
+ if (!l.defined () || (def_ovr && !l.belongs (rs)))
{
- value& v (root.assign (var) = std::forward<T> (def_val)); // VC14
+ value& v (rs.assign (var) = std::forward<T> (def_val)); // VC14
v.extra = true; // Default value flag.
- n = (save_flags & save_commented) == 0; // Absence means default.
- l = lookup (v, var, root);
- org = make_pair (l, 1); // Lookup depth is 1 since it's in root.vars.
+ n = (sflags & save_default_commented) == 0; // Absence means default.
+ l = lookup (v, var, rs);
+ org = make_pair (l, 1); // Lookup depth is 1 since it's in rs.vars.
}
// Treat an inherited value that was set to default as new.
//
else if (l->extra)
- n = (save_flags & save_commented) == 0; // Absence means default.
+ n = (sflags & save_default_commented) == 0; // Absence means default.
if (var.overrides != nullptr)
{
- pair<lookup, size_t> ovr (root.find_override (var, move (org)));
+ pair<lookup, size_t> ovr (rs.find_override (var, move (org)));
if (l != ovr.first) // Overriden?
{