aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJedidiah Barber <contact@jedbarber.id.au>2026-01-22 10:43:33 +1300
committerJedidiah Barber <contact@jedbarber.id.au>2026-01-22 10:43:33 +1300
commit42e3c2fa30552a227e38f03b859f03ae51f9000d (patch)
tree40833de7cfbe03168516c1df23e25ff7502844dd
parent2f622510f4feecee552c43a31bd592d1c7f6617f (diff)
Moved < operator for Graph_Component_Access over to Pretty_Print package
-rw-r--r--src/kompsos-pretty_print.adb20
-rw-r--r--src/kompsos-pretty_print.ads5
-rw-r--r--src/kompsos.adb21
-rw-r--r--src/kompsos.ads4
4 files changed, 25 insertions, 25 deletions
diff --git a/src/kompsos-pretty_print.adb b/src/kompsos-pretty_print.adb
index a9ba9e2..729b658 100644
--- a/src/kompsos-pretty_print.adb
+++ b/src/kompsos-pretty_print.adb
@@ -11,7 +11,9 @@ with
Ada.Characters.Latin_1,
Ada.Strings.Fixed,
Ada.Strings.Unbounded,
- Kompsos.Collector;
+ Kompsos.Collector,
+ System.Address_To_Access_Conversions,
+ System.Storage_Elements;
package body Kompsos.Pretty_Print is
@@ -24,6 +26,22 @@ package body Kompsos.Pretty_Print is
+ package Graph_Convert is new System.Address_To_Access_Conversions (Graph_Component);
+
+ function "<"
+ (Left, Right : in Graph_Component_Access)
+ return Boolean
+ is
+ use System.Storage_Elements;
+ begin
+ return
+ To_Integer (Graph_Convert.To_Address (Graph_Convert.Object_Pointer (Left))) <
+ To_Integer (Graph_Convert.To_Address (Graph_Convert.Object_Pointer (Right)));
+ end "<";
+
+
+
+
function Image
(Item : in Long_Natural)
return String is
diff --git a/src/kompsos-pretty_print.ads b/src/kompsos-pretty_print.ads
index 2e32fb8..5f388b9 100644
--- a/src/kompsos-pretty_print.ads
+++ b/src/kompsos-pretty_print.ads
@@ -61,6 +61,11 @@ private
return String;
+
+ function "<"
+ (Left, Right : in Graph_Component_Access)
+ return Boolean;
+
package DOT_Node_Maps is new Ada.Containers.Ordered_Maps
(Key_Type => Graph_Component_Access,
Element_Type => Long_Natural);
diff --git a/src/kompsos.adb b/src/kompsos.adb
index 87c8555..f7f0ba9 100644
--- a/src/kompsos.adb
+++ b/src/kompsos.adb
@@ -9,9 +9,7 @@
with
Ada.Unchecked_Deallocation,
- Kompsos.Collector,
- System.Address_To_Access_Conversions,
- System.Storage_Elements;
+ Kompsos.Collector;
package body Kompsos is
@@ -228,23 +226,6 @@ package body Kompsos is
- -- Goal Graphs --
-
- package Graph_Convert is new System.Address_To_Access_Conversions (Graph_Component);
-
- function "<"
- (Left, Right : in Graph_Component_Access)
- return Boolean
- is
- use System.Storage_Elements;
- begin
- return
- To_Integer (Graph_Convert.To_Address (Graph_Convert.Object_Pointer (Left))) <
- To_Integer (Graph_Convert.To_Address (Graph_Convert.Object_Pointer (Right)));
- end "<";
-
-
-
-------------------
-- microKanren --
diff --git a/src/kompsos.ads b/src/kompsos.ads
index 84b3ce2..66ebfd5 100644
--- a/src/kompsos.ads
+++ b/src/kompsos.ads
@@ -487,10 +487,6 @@ private
type Graph_Component_Access is access Graph_Component;
- function "<"
- (Left, Right : in Graph_Component_Access)
- return Boolean;
-
type Goal_Graph is new Ada.Finalization.Controlled with record
Actual : Graph_Component_Access := null;
end record;