1 files changed, 122 insertions, 108 deletions
diff --git a/test/ratnest-tests.ads b/test/ratnest-tests.ads
index e9ea347..cc67120 100644
--- a/test/ratnest-tests.ads
+++ b/test/ratnest-tests.ads
@@ -3,114 +3,128 @@
 package Ratnest.Tests is
 
 
-    function Valid_Message_Check return Test_Result;
-    function Valid_Identifier_Check return Test_Result;
-    function Join_Check return Test_Result;
-    function Encode_1_Check return Test_Result;
-    function Encode_2_Check return Test_Result;
-    function Encode_3_Check return Test_Result;
-    function Encode_4_Check return Test_Result;
-    function Decode_Check return Test_Result;
-
-    Error_Tests : Test_Array :=
-       ((+"Valid_Message", Valid_Message_Check'Access),
-        (+"Valid_Identifier", Valid_Identifier_Check'Access),
-        (+"Join", Join_Check'Access),
-        (+"Encode_1", Encode_1_Check'Access),
-        (+"Encode_2", Encode_2_Check'Access),
-        (+"Encode_3", Encode_3_Check'Access),
-        (+"Encode_4", Encode_4_Check'Access),
-        (+"Decode", Decode_Check'Access));
-
-
-
-
-    function Token_Adjust_Check return Test_Result;
-    function Token_Store_Check return Test_Result;
-
-    Token_Tests : Test_Array :=
-       ((+"Adjust", Token_Adjust_Check'Access),
-        (+"Storage", Token_Store_Check'Access));
-
-
-
-
-    function Lex_Sequence_Check return Test_Result;
-    function Lex_Count_Check return Test_Result;
-    function Lex_Many_Check return Test_Result;
-    function Lex_Many_Until_Check return Test_Result;
-
-    function Lex_Satisfy_Check return Test_Result;
-    function Lex_Satisfy_With_Check return Test_Result;
-    function Lex_Match_Check return Test_Result;
-    function Lex_Match_With_Check return Test_Result;
-    function Lex_Multimatch_Check return Test_Result;
-    function Lex_Take_Check return Test_Result;
-    function Lex_Take_While_Check return Test_Result;
-    function Lex_Take_Until_Check return Test_Result;
-
-    function Line_Start_Check return Test_Result;
-    function Line_End_Check return Test_Result;
-    function Input_Start_Check return Test_Result;
-    function Input_End_Check return Test_Result;
-
-    Lexer_Combinator_Tests : Test_Array :=
-       ((+"Sequence", Lex_Sequence_Check'Access),
-        (+"Count", Lex_Count_Check'Access),
-        (+"Many", Lex_Many_Check'Access),
-        (+"Many_Until", Lex_Many_Until_Check'Access),
-        (+"Satisfy", Lex_Satisfy_Check'Access),
-        (+"Satisfy With", Lex_Satisfy_With_Check'Access),
-        (+"Match", Lex_Match_Check'Access),
-        (+"Match With", Lex_Match_With_Check'Access),
-        (+"Multimatch", Lex_Multimatch_Check'Access),
-        (+"Take", Lex_Take_Check'Access),
-        (+"Take While", Lex_Take_While_Check'Access),
-        (+"Take Until", Lex_Take_Until_Check'Access),
-        (+"Line Start", Line_Start_Check'Access),
-        (+"Line End", Line_End_Check'Access),
-        (+"Input Start", Input_Start_Check'Access),
-        (+"Input_End", Input_End_Check'Access));
-
-
-
-
-    function In_Set_Check return Test_Result;
-    function Not_In_Set_Check return Test_Result;
-
-    Set_Predicate_Tests : Test_Array :=
-       ((+"In_Set", In_Set_Check'Access),
-        (+"Not_In_Set", Not_In_Set_Check'Access));
-
-
-
-
-    function Is_Digit_Check return Test_Result;
-    function Is_Hex_Check return Test_Result;
-    function Is_Letter_Check return Test_Result;
-    function Is_Alphanumeric_Check return Test_Result;
-    function Is_Punctuation_Check return Test_Result;
-    function Is_ASCII_Check return Test_Result;
-    function Is_Extended_ASCII_Check return Test_Result;
-    function Is_Space_Check return Test_Result;
-    function Is_Linespace_Check return Test_Result;
-    function Is_End_Of_Line_Check return Test_Result;
-    function Is_Whitespace_Check return Test_Result;
-    function Not_Whitespace_Check return Test_Result;
-
-    Util_Predicate_Tests : Test_Array :=
-       ((+"Is_Digit", Is_Digit_Check'Access),
-        (+"Is_Hex", Is_Hex_Check'Access),
-        (+"Is_Letter", Is_Letter_Check'Access),
-        (+"Is_Alphanumeric", Is_Alphanumeric_Check'Access),
-        (+"Is_Punctuation", Is_Punctuation_Check'Access),
-        (+"Is_ASCII", Is_ASCII_Check'Access),
-        (+"Is_Extended_ASCII", Is_Extended_ASCII_Check'Access),
-        (+"Is_Space", Is_Space_Check'Access),
-        (+"Is_Linespace", Is_Linespace_Check'Access),
-        (+"Is_End_Of_Line", Is_End_Of_Line_Check'Access),
-        (+"Is_Whitespace", Is_Whitespace_Check'Access),
-        (+"Not_Whitespace", Not_Whitespace_Check'Access));
+    package Errors is
+
+        function Valid_Message_Check return Test_Result;
+        function Valid_Identifier_Check return Test_Result;
+        function Join_Check return Test_Result;
+        function Encode_1_Check return Test_Result;
+        function Encode_2_Check return Test_Result;
+        function Encode_3_Check return Test_Result;
+        function Encode_4_Check return Test_Result;
+        function Decode_Check return Test_Result;
+
+        Tests : Test_Array :=
+           ((+"Valid_Message", Valid_Message_Check'Access),
+            (+"Valid_Identifier", Valid_Identifier_Check'Access),
+            (+"Join", Join_Check'Access),
+            (+"Encode_1", Encode_1_Check'Access),
+            (+"Encode_2", Encode_2_Check'Access),
+            (+"Encode_3", Encode_3_Check'Access),
+            (+"Encode_4", Encode_4_Check'Access),
+            (+"Decode", Decode_Check'Access));
+
+    end Errors;
+
+
+
+
+    package Tokens is
+
+        function Adjust_Check return Test_Result;
+        function Store_Check return Test_Result;
+
+        Tests : Test_Array :=
+           ((+"Adjust", Adjust_Check'Access),
+            (+"Storage", Store_Check'Access));
+
+    end Tokens;
+
+
+
+
+    package Lexer is
+
+        function Sequence_Check return Test_Result;
+        function Count_Check return Test_Result;
+        function Many_Check return Test_Result;
+        function Many_Until_Check return Test_Result;
+
+        function Satisfy_Check return Test_Result;
+        function Satisfy_With_Check return Test_Result;
+        function Match_Check return Test_Result;
+        function Match_With_Check return Test_Result;
+        function Multimatch_Check return Test_Result;
+        function Take_Check return Test_Result;
+        function Take_While_Check return Test_Result;
+        function Take_Until_Check return Test_Result;
+
+        function Line_Start_Check return Test_Result;
+        function Line_End_Check return Test_Result;
+        function Input_Start_Check return Test_Result;
+        function Input_End_Check return Test_Result;
+
+        Combinator_Tests : Test_Array :=
+           ((+"Sequence", Sequence_Check'Access),
+            (+"Count", Count_Check'Access),
+            (+"Many", Many_Check'Access),
+            (+"Many_Until", Many_Until_Check'Access),
+            (+"Satisfy", Satisfy_Check'Access),
+            (+"Satisfy With", Satisfy_With_Check'Access),
+            (+"Match", Match_Check'Access),
+            (+"Match With", Match_With_Check'Access),
+            (+"Multimatch", Multimatch_Check'Access),
+            (+"Take", Take_Check'Access),
+            (+"Take While", Take_While_Check'Access),
+            (+"Take Until", Take_Until_Check'Access),
+            (+"Line Start", Line_Start_Check'Access),
+            (+"Line End", Line_End_Check'Access),
+            (+"Input Start", Input_Start_Check'Access),
+            (+"Input_End", Input_End_Check'Access));
+
+    end Lexer;
+
+
+
+
+    package Util is
+
+        function In_Set_Check return Test_Result;
+        function Not_In_Set_Check return Test_Result;
+
+        Set_Predicate_Tests : Test_Array :=
+           ((+"In_Set", In_Set_Check'Access),
+            (+"Not_In_Set", Not_In_Set_Check'Access));
+
+
+        function Is_Digit_Check return Test_Result;
+        function Is_Hex_Check return Test_Result;
+        function Is_Letter_Check return Test_Result;
+        function Is_Alphanumeric_Check return Test_Result;
+        function Is_Punctuation_Check return Test_Result;
+        function Is_ASCII_Check return Test_Result;
+        function Is_Extended_ASCII_Check return Test_Result;
+        function Is_Space_Check return Test_Result;
+        function Is_Linespace_Check return Test_Result;
+        function Is_End_Of_Line_Check return Test_Result;
+        function Is_Whitespace_Check return Test_Result;
+        function Not_Whitespace_Check return Test_Result;
+
+        Predicate_Tests : Test_Array :=
+           ((+"Is_Digit", Is_Digit_Check'Access),
+            (+"Is_Hex", Is_Hex_Check'Access),
+            (+"Is_Letter", Is_Letter_Check'Access),
+            (+"Is_Alphanumeric", Is_Alphanumeric_Check'Access),
+            (+"Is_Punctuation", Is_Punctuation_Check'Access),
+            (+"Is_ASCII", Is_ASCII_Check'Access),
+            (+"Is_Extended_ASCII", Is_Extended_ASCII_Check'Access),
+            (+"Is_Space", Is_Space_Check'Access),
+            (+"Is_Linespace", Is_Linespace_Check'Access),
+            (+"Is_End_Of_Line", Is_End_Of_Line_Check'Access),
+            (+"Is_Whitespace", Is_Whitespace_Check'Access),
+            (+"Not_Whitespace", Not_Whitespace_Check'Access));
+
+    end Util;
 
 
 end Ratnest.Tests;