syncraft 0.1.14__py3-none-any.whl → 0.1.16__py3-none-any.whl

syncraft/algebra.py

@@ -170,17 +170,7 @@ class ThenResult(Generic[A, B], StructuralResult):
     right: B
     def bimap(self, ctx: Any) -> Tuple[Any, Callable[[Any], StructuralResult]]:
         def branch(b: Any) -> Tuple[Any, Callable[[Any], StructuralResult]]:
-            if isinstance(b, ThenResult):
-                value, backward = b.bimap(ctx)
-                if isinstance(value, tuple):
-                    x, y = ThenResult.flat(value)
-                    return x, lambda data: ThenResult(self.kind, y(data), self.right)
-                else:
-                    return value, backward
-            elif isinstance(b, StructuralResult):
-                return b.bimap(ctx)
-            else:
-                return b, lambda x: x
+            return b.bimap(ctx) if isinstance(b, StructuralResult) else (b, lambda x: x)
         match self.kind:
             case ThenKind.BOTH:
                 left_value, left_bmap = branch(self.left)

syncraft/generator.py

@@ -147,24 +147,31 @@ class TokenGen(TokenSpec):
 @dataclass(frozen=True)
 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]]]:
-            wrapper = input.wrapper()
-            input = input if not input.is_named else input.down(0)  # If the input is named, we need to go down to the first child
-            lft = input.left() 
-            match self.run(lft, use_cache=use_cache):
-                case Left(error):
-                    return Left(error)
-                case Right((value, next_input)):
-                    r = input.right() 
-                    match f(value).run(r, use_cache):
-                        case Left(e):
-                            return Left(e)
-                        case Right((result, next_input)):
-                            return Right((wrapper(result), next_input))
-            raise ValueError("flat_map should always return a value or an error.")
-        return Generator(run_f = flat_map_run, name=self.name) # type: ignore  
-    
-        
+        def flat_map_run(original: GenState[T], use_cache:bool) -> Either[Any, Tuple[B, GenState[T]]]:
+            wrapper = original.wrapper()
+            input = original if not original.is_named else original.down(0)  # If the input is named, we need to go down to the first child
+            try:
+                lft = input.left() 
+                match self.run(lft, use_cache=use_cache):
+                    case Left(error):
+                        return Left(error)
+                    case Right((value, next_input)):
+                        r = input.right() 
+                        match f(value).run(r, use_cache):
+                            case Left(e):
+                                return Left(e)
+                            case Right((result, next_input)):
+                                return Right((wrapper(result), next_input))
+                raise ValueError("flat_map should always return a value or an error.")
+            except Exception as e:
+                return Left(Error(
+                    message=str(e),
+                    this=self,
+                    state=original,
+                    error=e
+                ))
+        return Generator(run_f = flat_map_run, name=self.name) # type: ignore
+
 
     def many(self, *, at_least: int, at_most: Optional[int]) -> Algebra[ManyResult[GenResult[T]], GenState[T]]:
         assert at_least > 0, "at_least must be greater than 0"

{syncraft-0.1.14.dist-info → syncraft-0.1.16.dist-info}/METADATA

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

{syncraft-0.1.14.dist-info → syncraft-0.1.16.dist-info}/RECORD

@@ -1,15 +1,15 @@
 syncraft/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-syncraft/algebra.py,sha256=T2pcGOgoJptb7fYS2WqPldcEtmVe-jfPLbK_Uu7d6tA,23173
+syncraft/algebra.py,sha256=l_ptzSkXbRGSLzu46GXixcNQPdXAi1s5R9nRDI86JkY,22785
 syncraft/ast.py,sha256=s3BDm67IKd8WNEPszkGRgJ-SJAKewbERL0baLgfkXaQ,4634
 syncraft/cmd.py,sha256=DzXgU8QLVOg0YTFKpmOyzbf02LKPphQ4EeKSLzqpJ_s,2012
 syncraft/diagnostic.py,sha256=_kLbl1LlU4Y2PtsLLZFA_OLqeZqq1f2rjT_LRXLnDaI,2813
 syncraft/dsl.py,sha256=AxAZKu6MBfaG7Wzss3UISbQsrFaigc1L-hS3p_CAXWQ,13620
-syncraft/generator.py,sha256=U27EAWsuZL9AsQT2cGjgyM1isAfdQaPhOCyyn-yB-Ak,10983
+syncraft/generator.py,sha256=wUOe0h9Nl8EczcExcofvG2-L1lgnYEqVdn6fk9t5cjQ,11268
 syncraft/parser.py,sha256=c1cCCW0RNw2y4XlNIUkrMf7q5lkm8wes4v5xbjLAUGg,11573
 syncraft/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 syncraft/sqlite3.py,sha256=WR4wFf2CraRkb7C5rph3wsu6sGbG_7EjEZDUsPH8xqU,34677
-syncraft-0.1.14.dist-info/licenses/LICENSE,sha256=wHSV424U5csa3339dy1AZbsz2xsd0hrkMx2QK48CcUk,1062
-syncraft-0.1.14.dist-info/METADATA,sha256=EboJguSsSHYP0EYNfYBBXc0ewPPf0unH2_lC-SecSJk,946
-syncraft-0.1.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-syncraft-0.1.14.dist-info/top_level.txt,sha256=Kq3t8ESXB2xW1Xt3uPmkENFc-c4f2pamNmaURBk7zc8,9
-syncraft-0.1.14.dist-info/RECORD,,
+syncraft-0.1.16.dist-info/licenses/LICENSE,sha256=wHSV424U5csa3339dy1AZbsz2xsd0hrkMx2QK48CcUk,1062
+syncraft-0.1.16.dist-info/METADATA,sha256=tSjOId_YaSbZxfoGieLiOGw-qnyQNxb_s9CoVo87tRo,946
+syncraft-0.1.16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+syncraft-0.1.16.dist-info/top_level.txt,sha256=Kq3t8ESXB2xW1Xt3uPmkENFc-c4f2pamNmaURBk7zc8,9
+syncraft-0.1.16.dist-info/RECORD,,