From 01862116fefc0fb241beca2fb5402195dc933f7e Mon Sep 17 00:00:00 2001 From: Jed Barber Date: Sat, 5 Dec 2020 00:28:15 +1100 Subject: Moved Finished_Tokens and related types to Tokens package --- src/packrat-parsers.adb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/packrat-parsers.adb') diff --git a/src/packrat-parsers.adb b/src/packrat-parsers.adb index d854f73..1a3935c 100644 --- a/src/packrat-parsers.adb +++ b/src/packrat-parsers.adb @@ -23,7 +23,7 @@ package body Packrat.Parsers is (Left, Right : in Tok_Holds.Holder) return Boolean is - use type Graphs.Finished_Token_Array; + use type Traits.Tokens.Finished_Token_Array; begin return Left.Element < Right.Element; end "<"; @@ -86,10 +86,10 @@ package body Packrat.Parsers is function Element (Hold : in Tok_Holds.Holder) - return Graphs.Finished_Token_Array is + return Traits.Tokens.Finished_Token_Array is begin if Hold.Is_Empty then - return Value : Graphs.Finished_Token_Array (1 .. 0); + return Value : Traits.Tokens.Finished_Token_Array (1 .. 0); else return Hold.Element; end if; @@ -300,7 +300,7 @@ package body Packrat.Parsers is return Combinator_Result is use type Traits.Element_Array; - use type Graphs.Finished_Token_Array; + use type Traits.Tokens.Finished_Token_Array; Salt, Temp : Combinator_Result; Adjust : Result_Sets.Set; begin @@ -401,7 +401,7 @@ package body Packrat.Parsers is return Graphs.Empty_Graph; end if; declare - Root_Elems : Graphs.Finished_Token_Array (1 .. Length); + Root_Elems : Traits.Tokens.Finished_Token_Array (1 .. Length); begin for R of Root_Result.Results loop for T of Element (R.Tokens) loop @@ -538,7 +538,7 @@ package body Packrat.Parsers is return Combinator_Result is Salt : Combinator_Result := Combo (Input, Context, Start); - Current : Graphs.Finished_Token; + Current : Traits.Tokens.Finished_Token_Type; Processed : Result_Sets.Set; begin if Salt.Status = Failure then -- cgit