summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/directed_graphs.adb66
-rw-r--r--src/directed_graphs.ads40
2 files changed, 106 insertions, 0 deletions
diff --git a/src/directed_graphs.adb b/src/directed_graphs.adb
index 12916d1..bacb040 100644
--- a/src/directed_graphs.adb
+++ b/src/directed_graphs.adb
@@ -1019,6 +1019,12 @@ package body Directed_Graphs is
Impl.Unbusy (Object.Container.Tamper_Info);
end Finalize;
+ procedure Finalize
+ (Object : in out By_Iterator) is
+ begin
+ Impl.Unbusy (Object.Container.Tamper_Info);
+ end Finalize;
+
@@ -1163,6 +1169,17 @@ package body Directed_Graphs is
end if;
end First;
+ function First
+ (Object : in By_Iterator)
+ return Cursor is
+ begin
+ if Object.Filter = null or else Object.Filter (Object.Start) then
+ return Object.Start;
+ else
+ return Next (Object, Object.Start);
+ end if;
+ end First;
+
@@ -1628,6 +1645,40 @@ package body Directed_Graphs is
+ ----------------
+ -- Iterate_By --
+ ----------------
+
+ function Iterate_By
+ (Container : in Graph;
+ Start : in Cursor;
+ Chooser : in Choice_Function;
+ Filter : in Filter_Function := null)
+ return Graph_Iterator_Interfaces.Forward_Iterator'Class is
+ begin
+ if Impl.Checks then
+ if Start.Container /= Container'Unrestricted_Access then
+ raise Constraint_Error with "Cursor points to different graph";
+ end if;
+ if not Has_Element (Start) then
+ raise Constraint_Error with "Start Cursor points to nothing";
+ end if;
+ if Chooser = null then
+ raise Constraint_Error with "No choice function supplied";
+ end if;
+ end if;
+ return It : By_Iterator do
+ It.Container := Container'Unrestricted_Access;
+ It.Start := Start;
+ It.Chooser := Chooser;
+ It.Filter := Filter;
+ Impl.Busy (Container.Tamper_Info'Unrestricted_Access.all);
+ end return;
+ end Iterate_By;
+
+
+
+
----------------------
-- Iterate_Subgraph --
----------------------
@@ -2010,6 +2061,21 @@ package body Directed_Graphs is
end if;
end Next;
+ function Next
+ (Object : in By_Iterator;
+ Position : in Cursor)
+ return Cursor
+ is
+ Result : Cursor := Position;
+ begin
+ loop
+ Result := Object.Chooser (Result);
+ if Object.Filter = null or else Object.Filter (Result) then
+ return Result;
+ end if;
+ end loop;
+ end Next;
+
diff --git a/src/directed_graphs.ads b/src/directed_graphs.ads
index d31b7c7..3154f75 100644
--- a/src/directed_graphs.ads
+++ b/src/directed_graphs.ads
@@ -670,6 +670,21 @@ package Directed_Graphs is
Position : in Cursor)
return Graph_Iterator_Interfaces.Reversible_Iterator'Class;
+ type Choice_Function is access function
+ (Position : in Cursor)
+ return Cursor;
+
+ type Filter_Function is access function
+ (Position : in Cursor)
+ return Boolean;
+
+ function Iterate_By
+ (Container : in Graph;
+ Start : in Cursor;
+ Chooser : in Choice_Function;
+ Filter : in Filter_Function := null)
+ return Graph_Iterator_Interfaces.Forward_Iterator'Class;
+
function First
(Container : in Graph)
return Cursor;
@@ -963,6 +978,31 @@ private
+ type By_Iterator is new Ada.Finalization.Controlled and
+ Graph_Iterator_Interfaces.Forward_Iterator with
+ record
+ Container : Graph_Access;
+ Start : Cursor;
+ Chooser : Choice_Function;
+ Filter : Filter_Function;
+ end record
+ with Disable_Controlled => not Impl.T_Check;
+
+ overriding procedure Finalize
+ (Object : in out By_Iterator);
+
+ overriding function First
+ (Object : in By_Iterator)
+ return Cursor;
+
+ overriding function Next
+ (Object : in By_Iterator;
+ Position : in Cursor)
+ return Cursor;
+
+
+
+
generic
type Base_Type is private;
type Array_Type is array (Positive range <>) of Base_Type;