More bugfixes and Parser unit tests

1 files changed, 314 insertions, 33 deletions

diff --git a/test/rat_tests-parsers.adb b/test/rat_tests-parsers.adb
index 9368d6d..872925a 100644
--- a/test/rat_tests-parsers.adb
+++ b/test/rat_tests-parsers.adb
@@ -35,6 +35,208 @@ package body Rat_Tests.Parsers is
 
 
 
+    function Sequence_Check
+        return Test_Result
+    is
+        Input : String := "abcdefghi";
+        Context1, Context2 : Pone.Parsers.Parser_Context := One_Debug.Empty_Context;
+        Result1 : Pone.Parsers.Combinator_Result := Seq_ABCDEFG (Input, Context1, 1);
+        Result2 : Pone.Parsers.Combinator_Result := Seq_ABCDEFG (Input, Context2, 4);
+    begin
+        if One_Debug.Status (Result1) /= Packrat.Success or
+            One_Debug.Status (Result2) /= Packrat.Failure
+        then
+            return Fail;
+        end if;
+        declare
+            Result1_Parts : One_Debug.Result_Part_Array := One_Debug.Parts (Result1);
+        begin
+            if Result1_Parts'Length /= 1 or
+                One_Debug.Parts (Result2)'Length /= 0
+            then
+                return Fail;
+            end if;
+            if One_Debug.Finish (Result1_Parts (1)) /= 7 or
+                One_Debug.Value (Result1_Parts (1)) /= "abcdefg" or
+                One_Debug.Tokens (Result1_Parts (1))'Length /= 0
+            then
+                return Fail;
+            end if;
+        end;
+        return Pass;
+    end Sequence_Check;
+
+
+    function Sequence_2_Check
+        return Test_Result
+    is
+        Input : String := "aaaaa";
+        Input2 : String := "aaaab";
+        Context1, Context2, Context3, Context4 : Pone.Parsers.Parser_Context :=
+            One_Debug.Empty_Context;
+        function Match_A is new Pone.Parsers.Match ('a');
+        function Many_A is new Pone.Parsers.Many (Match_A, 0);
+        function Two_A is new Pone.Parsers.Multimatch ("aa");
+        function Seq_A is new Pone.Parsers.Sequence_2 (Many_A, Two_A);
+        Result1 : Pone.Parsers.Combinator_Result := Seq_A (Input, Context1, 1);
+        Result2 : Pone.Parsers.Combinator_Result := Seq_A (Input, Context2, 5);
+        Result3 : Pone.Parsers.Combinator_Result := Seq_A (Input2, Context3, 1);
+        Result4 : Pone.Parsers.Combinator_Result := Seq_A (Input2, Context4, 4);
+    begin
+        if One_Debug.Status (Result1) /= Packrat.Optional_More or
+            One_Debug.Status (Result2) /= Packrat.Needs_More or
+            One_Debug.Status (Result3) /= Packrat.Success or
+            One_Debug.Status (Result4) /= Packrat.Failure
+        then
+            return Fail;
+        end if;
+        declare
+            Result1_Parts : One_Debug.Result_Part_Array := One_Debug.Parts (Result1);
+            Result3_Parts : One_Debug.Result_Part_Array := One_Debug.Parts (Result3);
+        begin
+            if Result1_Parts'Length /= 4 or
+                One_Debug.Parts (Result2)'Length /= 0 or
+                Result3_Parts'Length /= 3 or
+                One_Debug.Parts (Result4)'Length /= 0
+            then
+                return Fail;
+            end if;
+            if One_Debug.Finish (Result1_Parts (1)) /= 2 or
+                One_Debug.Finish (Result1_Parts (2)) /= 3 or
+                One_Debug.Finish (Result1_Parts (3)) /= 4 or
+                One_Debug.Finish (Result1_Parts (4)) /= 5
+            then
+                return Fail;
+            end if;
+            if One_Debug.Value (Result1_Parts (1)) /= "aa" or
+                One_Debug.Value (Result1_Parts (2)) /= "aaa" or
+                One_Debug.Value (Result1_Parts (3)) /= "aaaa" or
+                One_Debug.Value (Result1_Parts (4)) /= "aaaaa"
+            then
+                return Fail;
+            end if;
+            if (for some P of Result1_Parts => One_Debug.Tokens (P)'Length /= 0) then
+                return Fail;
+            end if;
+            if One_Debug.Finish (Result3_Parts (1)) /= 2 or
+                One_Debug.Finish (Result3_Parts (2)) /= 3 or
+                One_Debug.Finish (Result3_Parts (3)) /= 4
+            then
+                return Fail;
+            end if;
+            if One_Debug.Value (Result3_Parts (1)) /= "aa" or
+                One_Debug.Value (Result3_Parts (2)) /= "aaa" or
+                One_Debug.Value (Result3_Parts (3)) /= "aaaa"
+            then
+                return Fail;
+            end if;
+            if (for some P of Result3_Parts => One_Debug.Tokens (P)'Length /= 0) then
+                return Fail;
+            end if;
+        end;
+        return Pass;
+    end Sequence_2_Check;
+
+
+    function Choice_Check
+        return Test_Result
+    is
+        Input : String := "cccdefg";
+        Context1, Context2, Context3 : Pone.Parsers.Parser_Context := One_Debug.Empty_Context;
+        Result1 : Pone.Parsers.Combinator_Result := Choose_CCCDE (Input, Context1, 1);
+        Result2 : Pone.Parsers.Combinator_Result := Choose_CCCDE (Input, Context2, 3);
+        Result3 : Pone.Parsers.Combinator_Result := Choose_CCCDE (Input, Context3, 5);
+    begin
+        if One_Debug.Status (Result1) /= Packrat.Success or
+            One_Debug.Status (Result2) /= Packrat.Success or
+            One_Debug.Status (Result3) /= Packrat.Failure
+        then
+            return Fail;
+        end if;
+        declare
+            Result1_Parts : One_Debug.Result_Part_Array := One_Debug.Parts (Result1);
+            Result2_Parts : One_Debug.Result_Part_Array := One_Debug.Parts (Result2);
+        begin
+            if Result1_Parts'Length /= 4 or
+                Result2_Parts'Length /= 1 or
+                One_Debug.Parts (Result3)'Length /= 0
+            then
+                return Fail;
+            end if;
+            if One_Debug.Finish (Result1_Parts (1)) /= 1 or
+                One_Debug.Finish (Result1_Parts (2)) /= 2 or
+                One_Debug.Finish (Result1_Parts (3)) /= 3 or
+                One_Debug.Finish (Result1_Parts (4)) /= 5
+            then
+                return Fail;
+            end if;
+            if One_Debug.Value (Result1_Parts (1)) /= "c" or
+                One_Debug.Value (Result1_Parts (2)) /= "cc" or
+                One_Debug.Value (Result1_Parts (3)) /= "ccc" or
+                One_Debug.Value (Result1_Parts (4)) /= "cccde"
+            then
+                return Fail;
+            end if;
+            if (for some P of Result1_Parts => One_Debug.Tokens (P)'Length /= 0) then
+                return Fail;
+            end if;
+            if One_Debug.Finish (Result2_Parts (1)) /= 3 or
+                One_Debug.Value (Result2_Parts (1)) /= "c" or
+                One_Debug.Tokens (Result2_Parts (1))'Length /= 0
+            then
+                return Fail;
+            end if;
+        end;
+        return Pass;
+    end Choice_Check;
+
+
+    function Choice_2_Check
+        return Test_Result
+    is
+        Input : String := "matmat";
+        Input2 : String := "ma";
+        Context1, Context2, Context3 : Pone.Parsers.Parser_Context := One_Debug.Empty_Context;
+        function Match_Mat is new Pone.Parsers.Multimatch ("mat");
+        function Match_Match is new Pone.Parsers.Multimatch ("match");
+        function Choo_Choo is new Pone.Parsers.Choice_2 (Match_Mat, Match_Match);
+        Result1 : Pone.Parsers.Combinator_Result := Choo_Choo (Input, Context1, 1);
+        Result2 : Pone.Parsers.Combinator_Result := Choo_Choo (Input, Context2, 4);
+        Result3 : Pone.Parsers.Combinator_Result := Choo_Choo (Input2, Context3, 1);
+    begin
+        if One_Debug.Status (Result1) /= Packrat.Success or
+            One_Debug.Status (Result2) /= Packrat.Optional_More or
+            One_Debug.Status (Result3) /= Packrat.Needs_More
+        then
+            return Fail;
+        end if;
+        declare
+            Result1_Parts : One_Debug.Result_Part_Array := One_Debug.Parts (Result1);
+            Result2_Parts : One_Debug.Result_Part_Array := One_Debug.Parts (Result2);
+        begin
+            if Result1_Parts'Length /= 1 or
+                Result2_Parts'Length /= 1 or
+                One_Debug.Parts (Result3)'Length /= 0
+            then
+                return Fail;
+            end if;
+            if One_Debug.Finish (Result1_Parts (1)) /= 3 or
+                One_Debug.Value (Result1_Parts (1)) /= "mat" or
+                One_Debug.Tokens (Result1_Parts (1))'Length /= 0
+            then
+                return Fail;
+            end if;
+            if One_Debug.Finish (Result2_Parts (1)) /= 6 or
+                One_Debug.Value (Result2_Parts (1)) /= "mat" or
+                One_Debug.Tokens (Result2_Parts (1))'Length /= 0
+            then
+                return Fail;
+            end if;
+        end;
+        return Pass;
+    end Choice_2_Check;
+
+
     function Count_Check
         return Test_Result
     is
@@ -66,7 +268,7 @@ package body Rat_Tests.Parsers is
                 return Fail;
             end if;
             if One_Debug.Finish (Result1_Parts (1)) /= 3 or
-                One_Debug.Value (Result1_Parts (1))'Length /= 3 or
+                One_Debug.Value (Result1_Parts (1)) /= "aaa" or
                 One_Debug.Tokens (Result1_Parts (1))'Length /= 0
             then
                 return Fail;
@@ -113,10 +315,10 @@ package body Rat_Tests.Parsers is
                 return Fail;
             end if;
             if One_Debug.Value (Result1_Parts (1))'Length /= 0 or
-                One_Debug.Value (Result1_Parts (2))'Length /= 1 or
-                One_Debug.Value (Result1_Parts (3))'Length /= 2 or
-                One_Debug.Value (Result1_Parts (4))'Length /= 3 or
-                One_Debug.Value (Result1_Parts (5))'Length /= 4
+                One_Debug.Value (Result1_Parts (2)) /= "a" or
+                One_Debug.Value (Result1_Parts (3)) /= "ab" or
+                One_Debug.Value (Result1_Parts (4)) /= "abc" or
+                One_Debug.Value (Result1_Parts (5)) /= "abcd"
             then
                 return Fail;
             end if;
@@ -139,11 +341,11 @@ package body Rat_Tests.Parsers is
                 return Fail;
             end if;
             if One_Debug.Value (Result3_Parts (1))'Length /= 0 or
-                One_Debug.Value (Result3_Parts (2))'Length /= 1 or
-                One_Debug.Value (Result3_Parts (3))'Length /= 2 or
-                One_Debug.Value (Result3_Parts (4))'Length /= 3 or
-                One_Debug.Value (Result3_Parts (5))'Length /= 4 or
-                One_Debug.Value (Result3_Parts (6))'Length /= 5
+                One_Debug.Value (Result3_Parts (2)) /= "e" or
+                One_Debug.Value (Result3_Parts (3)) /= "ef" or
+                One_Debug.Value (Result3_Parts (4)) /= "efg" or
+                One_Debug.Value (Result3_Parts (5)) /= "efgh" or
+                One_Debug.Value (Result3_Parts (6)) /= "efghi"
             then
                 return Fail;
             end if;
@@ -191,8 +393,8 @@ package body Rat_Tests.Parsers is
             then
                 return Fail;
             end if;
-            if One_Debug.Value (Result1_Parts (1))'Length /= 3 or
-                One_Debug.Value (Result1_Parts (2))'Length /= 4
+            if One_Debug.Value (Result1_Parts (1)) /= "abc" or
+                One_Debug.Value (Result1_Parts (2)) /= "abcd"
             then
                 return Fail;
             end if;
@@ -207,9 +409,9 @@ package body Rat_Tests.Parsers is
             then
                 return Fail;
             end if;
-            if One_Debug.Value (Result3_Parts (1))'Length /= 3 or
-                One_Debug.Value (Result3_Parts (2))'Length /= 4 or
-                One_Debug.Value (Result3_Parts (3))'Length /= 5
+            if One_Debug.Value (Result3_Parts (1)) /= "efg" or
+                One_Debug.Value (Result3_Parts (2)) /= "efgh" or
+                One_Debug.Value (Result3_Parts (3)) /= "efghi"
             then
                 return Fail;
             end if;
@@ -224,6 +426,80 @@ package body Rat_Tests.Parsers is
     end Many_Min_Check;
 
 
+    function Followed_By_Check
+        return Test_Result
+    is
+        Input : String := "abc12de3";
+        Context1, Context2, Context3 : Pone.Parsers.Parser_Context := One_Debug.Empty_Context;
+        function Sat_Digit is new Pone.Parsers.Satisfy (Packrat.Utilities.Is_Digit);
+        function Digit_Follows is new Pone.Parsers.Followed_By (Sat_Digit);
+        Result1 : Pone.Parsers.Combinator_Result := Digit_Follows (Input, Context1, 3);
+        Result2 : Pone.Parsers.Combinator_Result := Digit_Follows (Input, Context2, 4);
+        Result3 : Pone.Parsers.Combinator_Result := Digit_Follows (Input, Context3, 9);
+    begin
+        if One_Debug.Status (Result1) /= Packrat.Failure or
+            One_Debug.Status (Result2) /= Packrat.Success or
+            One_Debug.Status (Result3) /= Packrat.Needs_More
+        then
+            return Fail;
+        end if;
+        declare
+            Result2_Parts : One_Debug.Result_Part_Array := One_Debug.Parts (Result2);
+        begin
+            if One_Debug.Parts (Result1)'Length /= 0 or
+                Result2_Parts'Length /= 1 or
+                One_Debug.Parts (Result3)'Length /= 0
+            then
+                return Fail;
+            end if;
+            if One_Debug.Finish (Result2_Parts (1)) /= 3 or
+                One_Debug.Value (Result2_Parts (1))'Length /= 0 or
+                One_Debug.Tokens (Result2_Parts (1))'Length /= 0
+            then
+                return Fail;
+            end if;
+        end;
+        return Pass;
+    end Followed_By_Check;
+
+
+    function Not_Followed_By_Check
+        return Test_Result
+    is
+        Input : String := "abc12de3";
+        Context1, Context2, Context3 : Pone.Parsers.Parser_Context := One_Debug.Empty_Context;
+        function Sat_Digit is new Pone.Parsers.Satisfy (Packrat.Utilities.Is_Digit);
+        function Digit_Not_Follows is new Pone.Parsers.Not_Followed_By (Sat_Digit);
+        Result1 : Pone.Parsers.Combinator_Result := Digit_Not_Follows (Input, Context1, 3);
+        Result2 : Pone.Parsers.Combinator_Result := Digit_Not_Follows (Input, Context2, 4);
+        Result3 : Pone.Parsers.Combinator_Result := Digit_Not_Follows (Input, Context3, 9);
+    begin
+        if One_Debug.Status (Result1) /= Packrat.Success or
+            One_Debug.Status (Result2) /= Packrat.Failure or
+            One_Debug.Status (Result3) /= Packrat.Needs_More
+        then
+            return Fail;
+        end if;
+        declare
+            Result1_Parts : One_Debug.Result_Part_Array := One_Debug.Parts (Result1);
+        begin
+            if Result1_Parts'Length /= 1 or
+                One_Debug.Parts (Result2)'Length /= 0 or
+                One_Debug.Parts (Result3)'Length /= 0
+            then
+                return Fail;
+            end if;
+            if One_Debug.Finish (Result1_Parts (1)) /= 2 or
+                One_Debug.Value (Result1_Parts (1))'Length /= 0 or
+                One_Debug.Tokens (Result1_Parts (1))'Length /= 0
+            then
+                return Fail;
+            end if;
+        end;
+        return Pass;
+    end Not_Followed_By_Check;
+
+
     function Many_Until_Nomin_Check
         return Test_Result
     is
@@ -257,7 +533,7 @@ package body Rat_Tests.Parsers is
                 return Fail;
             end if;
             if One_Debug.Finish (Result1_Parts (1)) /= 3 or
-                One_Debug.Value (Result1_Parts (1))'Length /= 3 or
+                One_Debug.Value (Result1_Parts (1)) /= "abc" or
                 One_Debug.Tokens (Result1_Parts (1))'Length /= 0
             then
                 return Fail;
@@ -301,7 +577,7 @@ package body Rat_Tests.Parsers is
                 return Fail;
             end if;
             if One_Debug.Finish (Result1_Parts (1)) /= 5 or
-                One_Debug.Value (Result1_Parts (1))'Length /= 5 or
+                One_Debug.Value (Result1_Parts (1)) /= "abcde" or
                 One_Debug.Tokens (Result1_Parts (1))'Length /= 0
             then
                 return Fail;
@@ -339,7 +615,7 @@ package body Rat_Tests.Parsers is
                 return Fail;
             end if;
             if One_Debug.Finish (Result1_Parts (1)) /= 2 or
-                One_Debug.Value (Result1_Parts (1))'Length /= 1 or
+                One_Debug.Value (Result1_Parts (1)) /= "b" or
                 One_Debug.Tokens (Result1_Parts (1))'Length /= 0
             then
                 return Fail;
@@ -378,7 +654,7 @@ package body Rat_Tests.Parsers is
                 return Fail;
             end if;
             if One_Debug.Finish (Result2_Parts (1)) /= 6 or
-                One_Debug.Value (Result2_Parts (1))'Length /= 1 or
+                One_Debug.Value (Result2_Parts (1)) /= "3" or
                 One_Debug.Tokens (Result2_Parts (1))'Length /= 0
             then
                 return Fail;
@@ -416,7 +692,7 @@ package body Rat_Tests.Parsers is
                 return Fail;
             end if;
             if One_Debug.Finish (Result2_Parts (1)) /= 5 or
-                One_Debug.Value (Result2_Parts (1))'Length /= 1 or
+                One_Debug.Value (Result2_Parts (1)) /= "b" or
                 One_Debug.Tokens (Result2_Parts (1))'Length /= 0
             then
                 return Fail;
@@ -454,7 +730,7 @@ package body Rat_Tests.Parsers is
                 return Fail;
             end if;
             if One_Debug.Finish (Result1_Parts (1)) /= 3 or
-                One_Debug.Value (Result1_Parts (1))'Length /= 1 or
+                One_Debug.Value (Result1_Parts (1)) /= "a" or
                 One_Debug.Tokens (Result1_Parts (1))'Length /= 0
             then
                 return Fail;
@@ -468,15 +744,19 @@ package body Rat_Tests.Parsers is
         return Test_Result
     is
         Input : String := "abcdefghi";
-        Context1, Context2, Context3 : Pone.Parsers.Parser_Context := One_Debug.Empty_Context;
+        Context1, Context2, Context3, Context4 : Pone.Parsers.Parser_Context :=
+            One_Debug.Empty_Context;
         function Multi is new Pone.Parsers.Multimatch ("def");
+        function Multi2 is new Pone.Parsers.Multimatch ("hijk");
         Result1 : Pone.Parsers.Combinator_Result := Multi (Input, Context1, 2);
         Result2 : Pone.Parsers.Combinator_Result := Multi (Input, Context2, 4);
         Result3 : Pone.Parsers.Combinator_Result := Multi (Input, Context3, 300);
+        Result4 : Pone.Parsers.Combinator_Result := Multi2 (Input, Context4, 8);
     begin
         if One_Debug.Status (Result1) /= Packrat.Failure or
             One_Debug.Status (Result2) /= Packrat.Success or
-            One_Debug.Status (Result3) /= Packrat.Failure
+            One_Debug.Status (Result3) /= Packrat.Failure or
+            One_Debug.Status (Result4) /= Packrat.Needs_More
         then
             return Fail;
         end if;
@@ -485,12 +765,13 @@ package body Rat_Tests.Parsers is
         begin
             if One_Debug.Parts (Result1)'Length /= 0 or
                 Result2_Parts'Length /= 1 or
-                One_Debug.Parts (Result3)'Length /= 0
+                One_Debug.Parts (Result3)'Length /= 0 or
+                One_Debug.Parts (Result4)'Length /= 0
             then
                 return Fail;
             end if;
             if One_Debug.Finish (Result2_Parts (1)) /= 6 or
-                One_Debug.Value (Result2_Parts (1))'Length /= 3 or
+                One_Debug.Value (Result2_Parts (1)) /= "def" or
                 One_Debug.Tokens (Result2_Parts (1))'Length /= 0
             then
                 return Fail;
@@ -532,10 +813,10 @@ package body Rat_Tests.Parsers is
                 return Fail;
             end if;
             if One_Debug.Finish (Result1_Parts (1)) /= 2 or
-                One_Debug.Value (Result1_Parts (1))'Length /= 2 or
+                One_Debug.Value (Result1_Parts (1)) /= "ab" or
                 One_Debug.Tokens (Result1_Parts (1))'Length /= 0 or
                 One_Debug.Finish (Result2_Parts (1)) /= 7 or
-                One_Debug.Value (Result2_Parts (1))'Length /= 5 or
+                One_Debug.Value (Result2_Parts (1)) /= "cdefg" or
                 One_Debug.Tokens (Result2_Parts (1))'Length /= 0
             then
                 return Fail;
@@ -572,10 +853,10 @@ package body Rat_Tests.Parsers is
                 return Fail;
             end if;
             if One_Debug.Finish (Result1_Parts (1)) /= 3 or
-                One_Debug.Value (Result1_Parts (1))'Length /= 2 or
+                One_Debug.Value (Result1_Parts (1)) /= "bc" or
                 One_Debug.Tokens (Result1_Parts (1))'Length /= 0 or
                 One_Debug.Finish (Result3_Parts (1)) /= 9 or
-                One_Debug.Value (Result3_Parts (1))'Length /= 3 or
+                One_Debug.Value (Result3_Parts (1)) /= "def" or
                 One_Debug.Tokens (Result3_Parts (1))'Length /= 0
             then
                 return Fail;
@@ -612,10 +893,10 @@ package body Rat_Tests.Parsers is
                 return Fail;
             end if;
             if One_Debug.Finish (Result1_Parts (1)) /= 3 or
-                One_Debug.Value (Result1_Parts (1))'Length /= 2 or
+                One_Debug.Value (Result1_Parts (1)) /= "bc" or
                 One_Debug.Tokens (Result1_Parts (1))'Length /= 0 or
                 One_Debug.Finish (Result3_Parts (1)) /= 9 or
-                One_Debug.Value (Result3_Parts (1))'Length /= 2 or
+                One_Debug.Value (Result3_Parts (1)) /= "ef" or
                 One_Debug.Tokens (Result3_Parts (1))'Length /= 0
             then
                 return Fail;
@@ -698,8 +979,8 @@ package body Rat_Tests.Parsers is
             then
                 return Fail;
             end if;
-            if One_Debug.Value (Result1_Parts (1))'Length /= 1 or
-                One_Debug.Value (Result1_Parts (2))'Length /= 2
+            if One_Debug.Value (Result1_Parts (1)) /= "a" or
+                One_Debug.Value (Result1_Parts (2)) /= "aa"
             then
                 return Fail;
             end if;