summaryrefslogtreecommitdiff
path: root/src/kompsos-collector.ads
diff options
context:
space:
mode:
Diffstat (limited to 'src/kompsos-collector.ads')
-rw-r--r--src/kompsos-collector.ads17
1 files changed, 10 insertions, 7 deletions
diff --git a/src/kompsos-collector.ads b/src/kompsos-collector.ads
index d3e22a1..2b175a1 100644
--- a/src/kompsos-collector.ads
+++ b/src/kompsos-collector.ads
@@ -14,7 +14,8 @@ private with
generic
- Source : in World;
+ Relation : in Goal;
+ Within : in State;
package Kompsos.Collector is
@@ -37,9 +38,11 @@ package Kompsos.Collector is
private
- type World_Access is access all World;
+ type Goal_Access is access all Goal;
- type Constant_World_Access is access constant World;
+ type Constant_Goal_Access is access constant Goal;
+
+ type State_Access is access State;
type Eval_Kind is
(Unify_Data,
@@ -59,8 +62,8 @@ private
Dis_Gone2 : Boolean := False;
when Conjunct_Data =>
Con_From : Long_Positive := 2; -- Number one will be obtained by Get_Next already
- Con_Base : World_Access := null;
- Con_Part : World_Access := null;
+ Con_Base : State_Access := null;
+ Con_Part : Goal_Access := null;
Con_Next : Long_Positive := 1;
Con_Gone : Boolean := False;
when Recurse_Data =>
@@ -70,7 +73,7 @@ private
end record;
package Eval_Maps is new Ada.Containers.Ordered_Maps
- (Key_Type => World_Component_Access,
+ (Key_Type => Goal_Component_Access,
Element_Type => Eval_Data);
type Managed_Map is new Ada.Finalization.Controlled with record
@@ -81,7 +84,7 @@ private
(This : in out Managed_Map);
package Cache_Maps is new Ada.Containers.Ordered_Maps
- (Key_Type => World_Component_Access,
+ (Key_Type => Goal_Component_Access,
Element_Type => State_Vectors.Vector,
"=" => State_Vectors."=");