- reset added to Pop-parser

DHParser/error.pxd

@@ -2,3 +2,12 @@
 #cython: language_level=3
 #cython: c_string_type=unicode
 #cython: c_string_encoding=utf-8
+
+import cython
+
+@cython.locals(i=cython.int)
+cpdef linebreaks(test)
+
+@cython.locals(line=cython.int, column=cython.int)
+cpdef line_col(lbreaks, pos)
+

DHParser/parse.pxd

@@ -12,6 +12,11 @@ cdef class Parser:
     cdef object cycle_detection
 
     cpdef _parse(self, text)
+    cpdef reset(self)
+    cpdef _apply(self, func, flip)
+    # cpdef push_rollback__(self, int location, func)
+    # cpdef rollback_to__(self, int location)
+    # cpdef line_col__(self, text)
 
 cdef class Grammar:
     cdef dict __dict__

DHParser/parse.py

@@ -1251,7 +1251,7 @@ class UnaryOperator(Parser):
         return duplicate
 
     def _apply(self, func: ApplyFunc, flip: FlagFunc) -> bool:
-        if super()._apply(func, flip):
+        if super(UnaryOperator, self)._apply(func, flip):
             self.parser._apply(func, flip)
             return True
         return False
@@ -1282,7 +1282,7 @@ class NaryOperator(Parser):
         return duplicate
 
     def _apply(self, func: ApplyFunc, flip: FlagFunc) -> bool:
-        if super()._apply(func, flip):
+        if super(NaryOperator, self)._apply(func, flip):
             for parser in self.parsers:
                 parser._apply(func, flip)
             return True
@@ -2070,6 +2070,9 @@ class Pop(Retrieve):
     """
     def __init__(self, symbol: Parser, rfilter: RetrieveFilter = None) -> None:
         super().__init__(symbol, rfilter)
+
+    def reset(self):
+        super(Pop, self).reset()
         self.values = []
 
     def __deepcopy__(self, memo):
@@ -2203,7 +2206,7 @@ class Forward(Parser):
         self.parser = parser
 
     def _apply(self, func: ApplyFunc, flip: FlagFunc) -> bool:
-        if super()._apply(func, flip):
+        if super(Forward, self)._apply(func, flip):
             self.parser._apply(func, flip)
             return True
         return False