From 294a883863fa7713edc5278adddf8f60a28c8a9f Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 24 Feb 2022 10:03:43 +0200
Subject: WIP

---
 libbuild2/build/script/parser.cxx | 12 ++++++------
 libbuild2/build/script/script.cxx |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'libbuild2/build/script')

diff --git a/libbuild2/build/script/parser.cxx b/libbuild2/build/script/parser.cxx
index cba4b88..e9c8d9c 100644
--- a/libbuild2/build/script/parser.cxx
+++ b/libbuild2/build/script/parser.cxx
@@ -1622,12 +1622,12 @@ namespace build2
         {
           if (const target* pt =
               (p.target != nullptr ? p.target :
-               p.adhoc             ? reinterpret_cast<target*> (p.data)
+               p.adhoc ()          ? reinterpret_cast<target*> (p.data)
                : nullptr))
           {
             // Apply the --update-* filter.
             //
-            if (!p.adhoc && !filters.empty ())
+            if (!p.adhoc () && !filters.empty ())
             {
               // Compute and cache "effective" name that we will be pattern-
               // matching (similar code to variable_type_map::find()).
@@ -1695,7 +1695,7 @@ namespace build2
             // Mark as updated (see execute_update_prerequisites() for
             // details.
             //
-            if (!p.adhoc)
+            if (!p.adhoc ())
               p.data = 1;
           }
         }
@@ -1923,10 +1923,10 @@ namespace build2
 
                 if (const target* pt =
                     (p.target != nullptr ? p.target :
-                     p.adhoc             ? reinterpret_cast<target*> (p.data) :
+                     p.adhoc ()          ? reinterpret_cast<target*> (p.data) :
                      nullptr))
                 {
-                  if (ft == pt && (p.adhoc || p.data == 1))
+                  if (ft == pt && (p.adhoc () || p.data == 1))
                     return false;
                 }
               }
@@ -1968,7 +1968,7 @@ namespace build2
             {
               prerequisite_target& pt (pts.back ());
 
-              if (pt.adhoc)
+              if (pt.adhoc ())
               {
                 pt.data = reinterpret_cast<uintptr_t> (pt.target);
                 pt.target = nullptr;
diff --git a/libbuild2/build/script/script.cxx b/libbuild2/build/script/script.cxx
index 480903e..b230ca5 100644
--- a/libbuild2/build/script/script.cxx
+++ b/libbuild2/build/script/script.cxx
@@ -78,7 +78,7 @@ namespace build2
           {
             // See adhoc_buildscript_rule::execute_update_prerequisites().
             //
-            if (pt.target != nullptr && !pt.adhoc)
+            if (pt.target != nullptr && !pt.adhoc ())
               pt.target->as_name (ns);
           }
 
-- 
cgit v1.1