Redesigned Lexer Scan functions slightly, added tests for them

1 files changed, 11 insertions, 20 deletions

diff --git a/src/packrat-lexer.adb b/src/packrat-lexer.adb
index a563f69..7cbd527 100644
--- a/src/packrat-lexer.adb
+++ b/src/packrat-lexer.adb
@@ -164,15 +164,6 @@ package body Packrat.Lexer is
     end Scan;
 
 
-    procedure Scan_Set
-           (Input   : in     Element_Array;
-            Context : in out Lexer_Context;
-            Output  :    out Gen_Tokens.Token_Array) is
-    begin
-        null;
-    end Scan_Set;
-
-
     function Scan_Only
            (Input   : in     Element_Array;
             Context : in out Lexer_Context)
@@ -184,17 +175,8 @@ package body Packrat.Lexer is
     end Scan_Only;
 
 
-    procedure Scan_Set_Only
-           (Input   : in     Element_Array;
-            Context : in out Lexer_Context;
-            Output  :    out Gen_Tokens.Token_Array) is
-    begin
-        null;
-    end Scan_Set_Only;
-
-
     function Scan_With
-           (Input   : in     Element_Array;
+           (Input   : in     Lexer_With_Input;
             Context : in out Lexer_Context)
         return Gen_Tokens.Token_Array
     is
@@ -204,12 +186,21 @@ package body Packrat.Lexer is
     end Scan_With;
 
 
-    procedure Scan_Set_With
+    procedure Scan_Set
            (Input   : in     Element_Array;
             Context : in out Lexer_Context;
             Output  :    out Gen_Tokens.Token_Array) is
     begin
         null;
+    end Scan_Set;
+
+
+    procedure Scan_Set_With
+           (Input   : in     Lexer_With_Input;
+            Context : in out Lexer_Context;
+            Output  :    out Gen_Tokens.Token_Array) is
+    begin
+        null;
     end Scan_Set_With;