From 05d6e20accbf8ea92b1d17949a5d41d583887c6d Mon Sep 17 00:00:00 2001
From: "J. Gareth \"Curious Kit\" Moreton" <gareth@moreton-family.com>
Date: Fri, 26 Jan 2024 18:00:31 +0000
Subject: [PATCH]   * New Boolean "SetAndTest" utility function

---
 compiler/aoptutils.pas | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/compiler/aoptutils.pas b/compiler/aoptutils.pas
index c2c0f04743..b2a28fbe00 100644
--- a/compiler/aoptutils.pas
+++ b/compiler/aoptutils.pas
@@ -39,7 +39,10 @@ unit aoptutils;
     function SkipLabels(hp: tai; out hp2: tai): boolean;
 
     { sets hp2 to hp and returns True if hp is not nil }
-    function SetAndTest(const hp: tai; out hp2: tai): Boolean;
+    function SetAndTest(const hp: tai; out hp2: tai): Boolean; inline;
+
+    { Set Store and Result to Condition (useful as an inline assignment in a conditional block) }
+    function SetAndTest(const Condition: Boolean; out Store: Boolean): Boolean; inline;
 
   implementation
 
@@ -85,10 +88,18 @@ unit aoptutils;
       end;
 
     { sets hp2 to hp and returns True if hp is not nil }
-    function SetAndTest(const hp: tai; out hp2: tai): Boolean; inline;
+    function SetAndTest(const hp: tai; out hp2: tai): Boolean;
       begin
         hp2 := hp;
         Result := Assigned(hp);
       end;
 
+
+    { Set Store and Result to Condition (useful as an inline assignment in a conditional block) }
+    function SetAndTest(const Condition: Boolean; out Store: Boolean): Boolean;
+      begin
+        Store := Condition;
+        Result := Store;
+      end;
+
 end.