Redesigned Lexer Scan functions slightly, added tests for them

1 files changed, 14 insertions, 5 deletions

diff --git a/test/ratnest-tests.ads b/test/ratnest-tests.ads
index f795340..e72bfe7 100644
--- a/test/ratnest-tests.ads
+++ b/test/ratnest-tests.ads
@@ -90,21 +90,30 @@ package Ratnest.Tests is
         function Ignore_Check return Test_Result;
 
         function Scan_Check return Test_Result;
-        function Scan_Set_Check return Test_Result;
         function Scan_Only_Check return Test_Result;
-        function Scan_Set_Only_Check return Test_Result;
         function Scan_With_Check return Test_Result;
+        function Scan_Set_Check return Test_Result;
         function Scan_Set_With_Check return Test_Result;
 
+        function Scan_Error_Check return Test_Result;
+        function Scan_Only_Error_Check return Test_Result;
+        function Scan_With_Error_Check return Test_Result;
+        function Scan_Set_Error_Check return Test_Result;
+        function Scan_Set_With_Error_Check return Test_Result;
+
         Lexer_Tests : Test_Array :=
            ((+"Stamp", Stamp_Check'Access),
             (+"Ignore", Ignore_Check'Access),
             (+"Scan", Scan_Check'Access),
-            (+"Scan_Set", Scan_Set_Check'Access),
             (+"Scan_Only", Scan_Only_Check'Access),
-            (+"Scan_Set_Only", Scan_Set_Only_Check'Access),
             (+"Scan_With", Scan_With_Check'Access),
-            (+"Scan_Set_With", Scan_Set_With_Check'Access));
+            (+"Scan_Set", Scan_Set_Check'Access),
+            (+"Scan_Set_With", Scan_Set_With_Check'Access),
+            (+"Scan Exception", Scan_Error_Check'Access),
+            (+"Scan_Only Exception", Scan_Only_Error_Check'Access),
+            (+"Scan_With Exception", Scan_With_Error_Check'Access),
+            (+"Scan_Set Exception", Scan_Set_Error_Check'Access),
+            (+"Scan_Set_With Exception", Scan_Set_With_Error_Check'Access));
 
     end Lexer;