Fix Indefinite_Holders "=" operator

mosteo · Jan 28, 2024 · dff61d2 · dff61d2
1 parent ecc3877
commit dff61d2
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/src/aaa-containers-indefinite_holders.adb b/src/aaa-containers-indefinite_holders.adb
@@ -2,6 +2,23 @@ with Ada.Unchecked_Deallocation;
 
 package body AAA.Containers.Indefinite_Holders is
 
+ ---------
+ -- "=" --
+ ---------
+
+ overriding function "=" (L, R : Holder) return Boolean is
+ begin
+ if L.Is_Empty xor R.Is_Empty then
+ return False;
+ end if;
+
+ if L.Is_Empty and then R.Is_Empty then
+ return True;
+ end if;
+
+ return "=" (L.Item.all, R.Item.all);
+ end "=";
+
  -----------
  -- Clear --
  -----------

diff --git a/src/aaa-containers-indefinite_holders.ads b/src/aaa-containers-indefinite_holders.ads
@@ -2,12 +2,16 @@ with Ada.Finalization;
 
 generic
  type Held (<>) is private;
+ with function "=" (L, R : Held) return Boolean is <>;
 package AAA.Containers.Indefinite_Holders with Preelaborate is
 
- -- Simple holder to work around GNAT holders bug
+ -- Simple holder to work around GNAT holders bug. Comparison uses the held
+ -- value.
 
  type Holder is tagged private;
 
+ overriding function "=" (L, R : Holder) return Boolean;
+
  Empty_Holder : constant Holder;
 
  procedure Clear (This : in out Holder);