1 files changed, 64 insertions, 96 deletions

diff --git a/src/packrat-lexer-combinators.adb b/src/packrat-lexer-combinators.adb
index 1d51262..7dccede 100644
--- a/src/packrat-lexer-combinators.adb
+++ b/src/packrat-lexer-combinators.adb
@@ -4,46 +4,38 @@ package body Packrat.Lexer.Combinators is
 
 
     function Sequence
-           (Input  : in     Element_Array;
-            Start  : in     Positive;
-            Length :    out Natural;
-            Value  :    out Element_Array)
-        return Result is
+           (Input : in Element_Array;
+            Start : in Positive)
+        return Combinator_Result is
     begin
-        return Failure;
+        return Fail_Result;
     end Sequence;
 
 
     function Count
-           (Input  : in     Element_Array;
-            Start  : in     Positive;
-            Length :    out Natural;
-            Value  :    out Element_Array)
-        return Result is
+           (Input : in Element_Array;
+            Start : in Positive)
+        return Combinator_Result is
     begin
-        return Failure;
+        return Fail_Result;
     end Count;
 
 
     function Many
-           (Input  : in     Element_Array;
-            Start  : in     Positive;
-            Length :    out Natural;
-            Value  :    out Element_Array)
-        return Result is
+           (Input : in Element_Array;
+            Start : in Positive)
+        return Combinator_Result is
     begin
-        return Failure;
+        return Fail_Result;
     end Many;
 
 
     function Many_Until
-           (Input  : in     Element_Array;
-            Start  : in     Positive;
-            Length :    out Natural;
-            Value  :    out Element_Array)
-        return Result is
+           (Input : in Element_Array;
+            Start : in Positive)
+        return Combinator_Result is
     begin
-        return Failure;
+        return Fail_Result;
     end Many_Until;
 
 
@@ -51,90 +43,74 @@ package body Packrat.Lexer.Combinators is
 
 
     function Satisfy
-           (Input  : in     Element_Array;
-            Start  : in     Positive;
-            Length :    out Natural;
-            Value  :    out Element_Array)
-        return Result is
+           (Input : in Element_Array;
+            Start : in Positive)
+        return Combinator_Result is
     begin
-        return Failure;
+        return Fail_Result;
     end Satisfy;
 
 
     function Satisfy_With
-           (Input  : in     Element_Array;
-            Start  : in     Positive;
-            Length :    out Natural;
-            Value  :    out Element_Array)
-        return Result is
+           (Input : in Element_Array;
+            Start : in Positive)
+        return Combinator_Result is
     begin
-        return Failure;
+        return Fail_Result;
     end Satisfy_With;
 
 
     function Match
-           (Input  : in     Element_Array;
-            Start  : in     Positive;
-            Length :    out Natural;
-            Value  :    out Element_Array)
-        return Result is
+           (Input : in Element_Array;
+            Start : in Positive)
+        return Combinator_Result is
     begin
-        return Failure;
+        return Fail_Result;
     end Match;
 
 
     function Match_With
-           (Input  : in     Element_Array;
-            Start  : in     Positive;
-            Length :    out Natural;
-            Value  :    out Element_Array)
-        return Result is
+           (Input : in Element_Array;
+            Start : in Positive)
+        return Combinator_Result is
     begin
-        return Failure;
+        return Fail_Result;
     end Match_With;
 
 
     function Multimatch
-           (Input  : in     Element_Array;
-            Start  : in     Positive;
-            Length :    out Natural;
-            Value  :    out Element_Array)
-        return Result is
+           (Input : in Element_Array;
+            Start : in Positive)
+        return Combinator_Result is
     begin
-        return Failure;
+        return Fail_Result;
     end Multimatch;
 
 
     function Take
-           (Input  : in     Element_Array;
-            Start  : in     Positive;
-            Length :    out Natural;
-            Value  :    out Element_Array)
-        return Result is
+           (Input : in Element_Array;
+            Start : in Positive)
+        return Combinator_Result is
     begin
-        return Failure;
+        return Fail_Result;
     end Take;
 
 
     function Take_While
-           (Input  : in     Element_Array;
-            Start  : in     Positive;
-            Length :    out Natural;
-            Value  :    out Element_Array)
-        return Result is
+           (Input : in Element_Array;
+            Start : in Positive)
+        return Combinator_Result is
     begin
-        return Failure;
+        return Fail_Result;
     end Take_While;
 
 
     function Take_Until
-           (Input  : in     Element_Array;
-            Start  : in     Positive;
-            Length :    out Natural;
-            Value  :    out Element_Array)
-        return Result is
+           (Input : in Element_Array;
+            Start : in Positive)
+        return Combinator_Result is
     begin
-        return Failure;
+        return Fail_Result;
     end Take_Until;
 
 
@@ -142,46 +118,38 @@ package body Packrat.Lexer.Combinators is
 
 
     function Line_Start
-           (Input  : in     Element_Array;
-            Start  : in     Positive;
-            Length :    out Natural;
-            Value  :    out Element_Array)
-        return Result is
+           (Input : in Element_Array;
+            Start : in Positive)
+        return Combinator_Result is
     begin
-        return Failure;
+        return Fail_Result;
     end Line_Start;
 
 
     function Line_End
-           (Input  : in     Element_Array;
-            Start  : in     Positive;
-            Length :    out Natural;
-            Value  :    out Element_Array)
-        return Result is
+           (Input : in Element_Array;
+            Start : in Positive)
+        return Combinator_Result is
     begin
-        return Failure;
+        return Fail_Result;
     end Line_End;
 
 
     function Input_Start
-           (Input  : in     Element_Array;
-            Start  : in     Positive;
-            Length :    out Natural;
-            Value  :    out Element_Array)
-        return Result is
+           (Input : in Element_Array;
+            Start : in Positive)
+        return Combinator_Result is
     begin
-        return Failure;
+        return Fail_Result;
     end Input_Start;
 
 
     function Input_End
-           (Input  : in     Element_Array;
-            Start  : in     Positive;
-            Length :    out Natural;
-            Value  :    out Element_Array)
-        return Result is
+           (Input : in Element_Array;
+            Start : in Positive)
+        return Combinator_Result is
     begin
-        return Failure;
+        return Fail_Result;
     end Input_End;