syncraft 0.1.11__tar.gz → 0.1.12__tar.gz

{syncraft-0.1.11 → syncraft-0.1.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: syncraft
-Version: 0.1.11
+Version: 0.1.12
 Summary: Parser combinator library
 Author-email: Michael Afmokt <michael@esacca.com>
 License-Expression: MIT

{syncraft-0.1.11 → syncraft-0.1.12}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "syncraft"
-version = "0.1.11"
+version = "0.1.12"
 description = "Parser combinator library"
 license = "MIT"
 license-files = ["LICENSE"]

{syncraft-0.1.11 → syncraft-0.1.12}/syncraft/generator.py

@@ -142,7 +142,8 @@ class TokenGen(TokenSpec):
 class Generator(Algebra[GenResult[T], GenState[T]]):  
     def flat_map(self, f: Callable[[GenResult[T]], Algebra[B, GenState[T]]]) -> Algebra[B, GenState[T]]: 
         def flat_map_run(input: GenState[T], use_cache:bool) -> Either[Any, Tuple[B, GenState[T]]]:
-            match self.run(input.left(), use_cache=use_cache):
+            lft = input.left()
+            match self.run(lft, use_cache=use_cache):
                 case Left(error):
                     return Left(error)
                 case Right((value, next_input)):
@@ -175,8 +176,20 @@ class Generator(Algebra[GenResult[T], GenState[T]]):
                     match self.run(input.down(index), use_cache):
                         case Right((value, next_input)):
                             ret.append(value)
+                            if at_most is not None and len(ret) > at_most:
+                                return Left(Error(
+                                        message=f"Expected at most {at_most} matches, got {len(ret)}",
+                                        this=self,
+                                        state=input.down(index)
+                                    ))                             
                         case Left(_):
                             pass
+                if len(ret) < at_least:
+                    return Left(Error(
+                        message=f"Expected at least {at_least} matches, got {len(ret)}",
+                        this=self,
+                        state=input.down(index)
+                    )) 
                 return Right((ManyResult(tuple(ret)), input))
         return self.__class__(many_run, name=f"many({self.name})")  # type: ignore
     
@@ -203,7 +216,7 @@ class Generator(Algebra[GenResult[T], GenState[T]]):
                             case Left(error):
                                 return Left(error)
             raise ValueError("or_else should always return a value or an error.")
-        return self.__class__(or_else_run, name=f"free_or({self.name} | {other.name})") # type: ignore
+        return self.__class__(or_else_run, name=f"or_else({self.name} | {other.name})") # type: ignore
 
     @classmethod
     def token(cls, 

{syncraft-0.1.11 → syncraft-0.1.12}/syncraft.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: syncraft
-Version: 0.1.11
+Version: 0.1.12
 Summary: Parser combinator library
 Author-email: Michael Afmokt <michael@esacca.com>
 License-Expression: MIT