Bugfixes and extra parser combinators

1 files changed, 134 insertions, 3 deletions

diff --git a/src/packrat-parsers.ads b/src/packrat-parsers.ads
index 03b262c..a98170f 100644
--- a/src/packrat-parsers.ads
+++ b/src/packrat-parsers.ads
@@ -113,7 +113,6 @@ package Packrat.Parsers is
         return Combinator_Result;
 
     generic
-        Label : in Traits.Label_Enum;
         with function Combo
                (Input   : in     Traits.Element_Array;
                 Context : in out Parser_Context;
@@ -154,6 +153,23 @@ package Packrat.Parsers is
         return Combinator_Result;
 
     generic
+        with function Part_One
+               (Input   : in     Traits.Element_Array;
+                Context : in out Parser_Context;
+                Start   : in     Positive)
+            return Combinator_Result;
+        with function Part_Two
+               (Input   : in     Traits.Element_Array;
+                Context : in out Parser_Context;
+                Start   : in     Positive)
+            return Combinator_Result;
+    function Sequence_2
+           (Input   : in     Traits.Element_Array;
+            Context : in out Parser_Context;
+            Start   : in     Positive)
+        return Combinator_Result;
+
+    generic
         Params : in Combinator_Array;
     function Choice
            (Input   : in     Traits.Element_Array;
@@ -162,6 +178,23 @@ package Packrat.Parsers is
         return Combinator_Result;
 
     generic
+        with function Choice_One
+               (Input   : in     Traits.Element_Array;
+                Context : in out Parser_Context;
+                Start   : in     Positive)
+            return Combinator_Result;
+        with function Choice_Two
+               (Input   : in     Traits.Element_Array;
+                Context : in out Parser_Context;
+                Start   : in     Positive)
+            return Combinator_Result;
+    function Choice_2
+           (Input   : in     Traits.Element_Array;
+            Context : in out Parser_Context;
+            Start   : in     Positive)
+        return Combinator_Result;
+
+    generic
         with function Param
                (Input   : in     Traits.Element_Array;
                 Context : in out Parser_Context;
@@ -193,9 +226,38 @@ package Packrat.Parsers is
                 Context : in out Parser_Context;
                 Start   : in     Positive)
             return Combinator_Result;
+    function Followed_By
+           (Input   : in     Traits.Element_Array;
+            Context : in out Parser_Context;
+            Start   : in     Positive)
+        return Combinator_Result;
+
+    generic
+        with function Param
+               (Input   : in     Traits.Element_Array;
+                Context : in out Parser_Context;
+                Start   : in     Positive)
+            return Combinator_Result;
+    function Not_Followed_By
+           (Input   : in     Traits.Element_Array;
+            Context : in out Parser_Context;
+            Start   : in     Positive)
+        return Combinator_Result;
+
+
+
+
+    generic
+        with function Param
+               (Input   : in     Traits.Element_Array;
+                Context : in out Parser_Context;
+                Start   : in     Positive)
+            return Combinator_Result;
         with function Test
-               (Item : in Traits.Element_Type)
-            return Boolean;
+               (Input   : in     Traits.Element_Array;
+                Context : in out Parser_Context;
+                Start   : in     Positive)
+            return Combinator_Result;
         Minimum : in Natural := 0;
     function Many_Until
            (Input   : in     Traits.Element_Array;
@@ -215,6 +277,69 @@ package Packrat.Parsers is
             Start   : in     Positive)
         return Combinator_Result;
 
+    generic
+        with function Item
+               (Input   : in     Traits.Element_Array;
+                Context : in out Parser_Context;
+                Start   : in     Positive)
+            return Combinator_Result;
+        with function Separator
+               (Input   : in     Traits.Element_Array;
+                Context : in out Parser_Context;
+                Start   : in     Positive)
+            return Combinator_Result;
+        Minimum : in Natural := 0;
+    function Separate_By
+           (Input   : in     Traits.Element_Array;
+            Context : in out Parser_Context;
+            Start   : in     Positive)
+        return Combinator_Result;
+
+    generic
+        with function Item
+               (Input   : in     Traits.Element_Array;
+                Context : in out Parser_Context;
+                Start   : in     Positive)
+            return Combinator_Result;
+        with function Separator
+               (Input   : in     Traits.Element_Array;
+                Context : in out Parser_Context;
+                Start   : in     Positive)
+            return Combinator_Result;
+        with function Ender
+               (Input   : in     Traits.Element_Array;
+                Context : in out Parser_Context;
+                Start   : in     Positive)
+            return Combinator_Result;
+        Minimum : in Natural := 0;
+    function Separate_End_By
+           (Input   : in     Traits.Element_Array;
+            Context : in out Parser_Context;
+            Start   : in     Positive)
+        return Combinator_Result;
+
+    generic
+        with function Starter
+               (Input   : in     Traits.Element_Array;
+                Context : in out Parser_Context;
+                Start   : in     Positive)
+            return Combinator_Result;
+        with function Item
+               (Input   : in     Traits.Element_Array;
+                Context : in out Parser_Context;
+                Start   : in     Positive)
+            return Combinator_Result;
+        with function Ender
+               (Input   : in     Traits.Element_Array;
+                Context : in out Parser_Context;
+                Start   : in     Positive)
+            return Combinator_Result;
+    function Between
+           (Input   : in     Traits.Element_Array;
+            Context : in out Parser_Context;
+            Start   : in     Positive)
+        return Combinator_Result;
+
 
 
 
@@ -317,6 +442,12 @@ package Packrat.Parsers is
             Start   : in     Positive)
         return Combinator_Result;
 
+    function End_Of_Input
+           (Input   : in     Traits.Element_Array;
+            Context : in out Parser_Context;
+            Start   : in     Positive)
+        return Combinator_Result;
+
 
 private