Cleaned up Lexer, Util package names

11 files changed, 37 insertions, 40 deletions

diff --git a/src/packrat-lexer.adb b/src/packrat-lexers.adb
index 486aae5..fc63e4a 100644
--- a/src/packrat-lexer.adb
+++ b/src/packrat-lexers.adb
@@ -5,7 +5,7 @@ with
     Packrat.Errors;
 
 
-package body Packrat.Lexer is
+package body Packrat.Lexers is
 
 
     function Join
@@ -681,6 +681,6 @@ package body Packrat.Lexer is
     end Input_End;
 
 
-end Packrat.Lexer;
+end Packrat.Lexers;
 
 
diff --git a/src/packrat-lexer.ads b/src/packrat-lexers.ads
index b8090c9..57fc462 100644
--- a/src/packrat-lexer.ads
+++ b/src/packrat-lexers.ads
@@ -14,7 +14,7 @@ generic
 
     with package Traits is new Packrat.Traits (<>);
 
-package Packrat.Lexer is
+package Packrat.Lexers is
 
 
     type Combinator_Result is private;
@@ -322,6 +322,6 @@ private
         Allow_Incomplete => True);
 
 
-end Packrat.Lexer;
+end Packrat.Lexers;
 
 
diff --git a/src/packrat-util.adb b/src/packrat-utilities.adb
index c1335e0..97e4272 100644
--- a/src/packrat-util.adb
+++ b/src/packrat-utilities.adb
@@ -5,7 +5,7 @@ with
     Ada.Characters.Latin_1;
 
 
-package body Packrat.Util is
+package body Packrat.Utilities is
 
 
     package Latin renames Ada.Characters.Latin_1;
@@ -142,6 +142,6 @@ package body Packrat.Util is
     end Not_Whitespace;
 
 
-end Packrat.Util;
+end Packrat.Utilities;
 
 
diff --git a/src/packrat-util.ads b/src/packrat-utilities.ads
index cada441..15cd357 100644
--- a/src/packrat-util.ads
+++ b/src/packrat-utilities.ads
@@ -5,7 +5,7 @@ with
     Ada.Strings.Maps;
 
 
-package Packrat.Util is
+package Packrat.Utilities is
 
 
     generic
@@ -72,9 +72,6 @@ package Packrat.Util is
         return Boolean;
 
 
-private
-
-
-end Packrat.Util;
+end Packrat.Utilities;
 
 
diff --git a/test/packrat-lexer-debug.adb b/test/packrat-lexers-debug.adb
index 40dbd87..d748fd4 100644
--- a/test/packrat-lexer-debug.adb
+++ b/test/packrat-lexers-debug.adb
@@ -1,6 +1,6 @@
 
 
-package body Packrat.Lexer.Debug is
+package body Packrat.Lexers.Debug is
 
 
     function Create_Result
@@ -114,6 +114,6 @@ package body Packrat.Lexer.Debug is
     end Is_Success;
 
 
-end Packrat.Lexer.Debug;
+end Packrat.Lexers.Debug;
 
 
diff --git a/test/packrat-lexer-debug.ads b/test/packrat-lexers-debug.ads
index bd6c2de..5c5320a 100644
--- a/test/packrat-lexer-debug.ads
+++ b/test/packrat-lexers-debug.ads
@@ -6,7 +6,7 @@ with
 
 
 generic
-package Packrat.Lexer.Debug is
+package Packrat.Lexers.Debug is
 
 
     Empty_Fail : constant Combinator_Result;
@@ -78,12 +78,12 @@ package Packrat.Lexer.Debug is
 private
 
 
-    Empty_Fail : constant Combinator_Result := Packrat.Lexer.Empty_Fail;
+    Empty_Fail : constant Combinator_Result := Packrat.Lexers.Empty_Fail;
 
 
     type Token_Vector is new Token_Vectors.Vector with null record;
 
 
-end Packrat.Lexer.Debug;
+end Packrat.Lexers.Debug;
 
 
diff --git a/test/rat_tests-lexer.adb b/test/rat_tests-lexers.adb
index 531d175..0087f60 100644
--- a/test/rat_tests-lexer.adb
+++ b/test/rat_tests-lexers.adb
@@ -4,21 +4,21 @@ with
 
     Packrat.Errors,
     Packrat.Traits,
-    Packrat.Lexer.Debug,
-    Packrat.Util;
+    Packrat.Lexers.Debug,
+    Packrat.Utilities;
 
 
-package body Rat_Tests.Lexer is
+package body Rat_Tests.Lexers is
 
 
-    package PU renames Packrat.Util;
+    package PU renames Packrat.Utilities;
 
 
     type My_Labels is (One, Two, Three);
 
 
     package Slexy_Traits is new Packrat.Traits (My_Labels, Character, String);
-    package Slexy is new Packrat.Lexer (Slexy_Traits);
+    package Slexy is new Packrat.Lexers (Slexy_Traits);
     package Slebug is new Slexy.Debug;
 
 
@@ -651,7 +651,7 @@ package body Rat_Tests.Lexer is
     type Word_Enum is (Blank, Word, Whitespace);
 
     package Swordy_Traits is new Packrat.Traits (Word_Enum, Character, String);
-    package Swordy is new Packrat.Lexer (Swordy_Traits);
+    package Swordy is new Packrat.Lexers (Swordy_Traits);
     package Swolbug is new Swordy.Debug;
 
     use type Swordy_Traits.Tokens.Token;
@@ -1017,6 +1017,6 @@ package body Rat_Tests.Lexer is
     end Scan_Set_With_Error_Check;
 
 
-end Rat_Tests.Lexer;
+end Rat_Tests.Lexers;
 
 
diff --git a/test/rat_tests-lexer.ads b/test/rat_tests-lexers.ads
index bc3045c..0cf86b7 100644
--- a/test/rat_tests-lexer.ads
+++ b/test/rat_tests-lexers.ads
@@ -4,7 +4,7 @@ with Unit_Tests;
 use Unit_Tests;
 
 
-package Rat_Tests.Lexer is
+package Rat_Tests.Lexers is
 
 
     function Join_Check return Test_Result;
@@ -76,6 +76,6 @@ package Rat_Tests.Lexer is
         (+"Scan_Set_With Exception", Scan_Set_With_Error_Check'Access));
 
 
-end Rat_Tests.Lexer;
+end Rat_Tests.Lexers;
 
 
diff --git a/test/rat_tests-util.adb b/test/rat_tests-utilities.adb
index fe1f890..c1bb790 100644
--- a/test/rat_tests-util.adb
+++ b/test/rat_tests-utilities.adb
@@ -1,12 +1,12 @@
 
 
-with Packrat.Util;
+with Packrat.Utilities;
 
 
-package body Rat_Tests.Util is
+package body Rat_Tests.Utilities is
 
 
-    package PU renames Packrat.Util;
+    package PU renames Packrat.Utilities;
 
 
     function In_Set_Check
@@ -508,6 +508,6 @@ package body Rat_Tests.Util is
     end Not_Whitespace_Check;
 
 
-end Rat_Tests.Util;
+end Rat_Tests.Utilities;
 
 
diff --git a/test/rat_tests-util.ads b/test/rat_tests-utilities.ads
index 1b4754a..b3fcaee 100644
--- a/test/rat_tests-util.ads
+++ b/test/rat_tests-utilities.ads
@@ -4,7 +4,7 @@ with Unit_Tests;
 use Unit_Tests;
 
 
-package Rat_Tests.Util is
+package Rat_Tests.Utilities is
 
 
     function In_Set_Check return Test_Result;
@@ -43,6 +43,6 @@ package Rat_Tests.Util is
         (+"Not_Whitespace", Not_Whitespace_Check'Access));
 
 
-end Rat_Tests.Util;
+end Rat_Tests.Utilities;
 
 
diff --git a/test/test_main.adb b/test/test_main.adb
index ebca4fd..af59fdf 100644
--- a/test/test_main.adb
+++ b/test/test_main.adb
@@ -10,8 +10,8 @@ with
     Packrat.Tokens,
     Rat_Tests.Errors,
     Rat_Tests.Tokens,
-    Rat_Tests.Lexer,
-    Rat_Tests.Util,
+    Rat_Tests.Lexers,
+    Rat_Tests.Utilities,
     Rat_Tests.Parse_Graphs;
 
 use
@@ -79,19 +79,19 @@ begin
     Put (My_Tokens.Debug_String (Tok));
     New_Line;
 
-    Put_Line ("Running tests for Packrat.Lexer combinators...");
-    Run_Tests (Rat_Tests.Lexer.Combinator_Tests, How_Verbose);
+    Put_Line ("Running tests for Packrat.Lexers combinators...");
+    Run_Tests (Rat_Tests.Lexers.Combinator_Tests, How_Verbose);
     New_Line;
 
-    Put_Line ("Running tests for Packrat.Lexer lexing...");
-    Run_Tests (Rat_Tests.Lexer.Lexer_Tests, How_Verbose);
+    Put_Line ("Running tests for Packrat.Lexers lexing...");
+    Run_Tests (Rat_Tests.Lexers.Lexer_Tests, How_Verbose);
     New_Line;
 
-    Put_Line ("Running tests for Packrat.Util...");
+    Put_Line ("Running tests for Packrat.Utilities...");
     Put_Line ("Testing set predicates...");
-    Run_Tests (Rat_Tests.Util.Set_Predicate_Tests, How_Verbose);
+    Run_Tests (Rat_Tests.Utilities.Set_Predicate_Tests, How_Verbose);
     Put_Line ("Testing ordinary predicates...");
-    Run_Tests (Rat_Tests.Util.Predicate_Tests, How_Verbose);
+    Run_Tests (Rat_Tests.Utilities.Predicate_Tests, How_Verbose);
     New_Line;
 
     Put_Line ("Running tests for Packrat.Parse_Graphs...");