syncraft 0.1.36__py3-none-any.whl → 0.1.38__py3-none-any.whl

syncraft/finder.py

@@ -35,8 +35,8 @@ def matches(syntax: Syntax[Any, Any], data: ParseResult[Any])-> bool:
 
 
 def find(syntax: Syntax[Any, Any], data: ParseResult[Any]) -> YieldGen[ParseResult[Any], None, None]:
-    if matches(syntax, data):
-        if not isinstance(data, Marked):
+    if not isinstance(data, Marked):
+        if matches(syntax, data):
             yield data
     match data:
         case Then(left=left, right=right):

syncraft/syntax.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from typing import (
     Optional, Any, TypeVar, Generic, Callable, Tuple, cast,
-    Type, Literal, List
+    Type, Literal, List, overload
 )
 from dataclasses import dataclass, field, replace
 from functools import reduce
@@ -250,14 +250,20 @@ class Syntax(Generic[A, S]):
 
 
 ######################################################################## data processing combinators #########################################################
+    @overload
+    def bind(self,
+             var: Variable, 
+             collector: None = None)-> Syntax[A | Marked[A], S]: ...
+    
+    @overload
+    def bind(self,
+             var: Variable,
+             collector: Type[E]) -> Syntax[Collect[A, E] | Marked[Collect[A, E]], S]: ...
+             
     def bind(self, 
              var: Variable, 
-             collector: Optional[Type[E]]=None) -> Syntax[A | 
-                                                                   Marked[A] | 
-                                                                   Marked[Collect[A, E]] | 
-                                                                   Collect[A, E], S]:
-        def bind_v(v: A | Marked[A] | Marked[Collect[A, E]] | Collect[A, E], 
-                   s: S)->Tuple[A | Marked[A] | Marked[Collect[A, E]] | Collect[A, E], S]:
+             collector: Optional[Type[E]]=None) -> Syntax[Any, S]:
+        def bind_v(v: Any, s: S)->Tuple[Any, S]:
             return v, s.bind(var, v)
         if callable(collector):
             ret = self.to(collector).mark(var.name).map_all(bind_v) if var.name else self.to(collector).map_all(bind_v) 

{syncraft-0.1.36.dist-info → syncraft-0.1.38.dist-info}/METADATA

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

{syncraft-0.1.36.dist-info → syncraft-0.1.38.dist-info}/RECORD

@@ -3,14 +3,14 @@ syncraft/algebra.py,sha256=U28UIKK4oh2yIuvOqKYeo4_lDkX3Sy_nHSaHnIabcbk,15769
 syncraft/ast.py,sha256=TAHj8IOgx_QtlI4zxFr2DRGZ4dwNGsb6TiH0TH9adIg,14556
 syncraft/constraint.py,sha256=eTXINghioXmJzAtW3jM-Q_TW2LYXu6mUDq34KlI_x-w,6440
 syncraft/diagnostic.py,sha256=cgwcQnCcgrCRX3h-oGTDb5rcJAtitPV3LfH9eLvO93E,2837
-syncraft/finder.py,sha256=m0_SeUH-GPG3EBZY8bfZyASzWFFLpf2S3PijE_OMtj0,1920
+syncraft/finder.py,sha256=Wr7wiBuO9IaXBmYBA4DNXmoeEWteRIp-UetnuRScapM,1920
 syncraft/generator.py,sha256=C0vpJotp982anrSXq1-EdjQU_OMI_vDCa7uTdJK8M5M,12987
 syncraft/parser.py,sha256=RkQwFv00rOI-n4kvG4baGVTdK46T-_Hw7OJ0FB7g72g,11379
 syncraft/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 syncraft/sqlite3.py,sha256=Pq09IHZOwuWg5W82l9D1flzd36QV0TOHQpTJ5U02V8g,34701
-syncraft/syntax.py,sha256=kZceLSgq2E2ViTcJ6Q6yp6nJ7bSKUFukshTbpmnzcCs,17762
-syncraft-0.1.36.dist-info/licenses/LICENSE,sha256=wHSV424U5csa3339dy1AZbsz2xsd0hrkMx2QK48CcUk,1062
-syncraft-0.1.36.dist-info/METADATA,sha256=l2bcaB4sLUdy6Hzl4evI9b-2rNb102EiwvX9V7KWnG4,989
-syncraft-0.1.36.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-syncraft-0.1.36.dist-info/top_level.txt,sha256=Kq3t8ESXB2xW1Xt3uPmkENFc-c4f2pamNmaURBk7zc8,9
-syncraft-0.1.36.dist-info/RECORD,,
+syncraft/syntax.py,sha256=RxRdXR0KF5awmbaumfpkb1rvgMuCl0nhVIm3V20MB-U,17699
+syncraft-0.1.38.dist-info/licenses/LICENSE,sha256=wHSV424U5csa3339dy1AZbsz2xsd0hrkMx2QK48CcUk,1062
+syncraft-0.1.38.dist-info/METADATA,sha256=aO928d0qKdo3EiiNIfeAIoAnbKs84902-TKwHZ2B9JU,989
+syncraft-0.1.38.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+syncraft-0.1.38.dist-info/top_level.txt,sha256=Kq3t8ESXB2xW1Xt3uPmkENFc-c4f2pamNmaURBk7zc8,9
+syncraft-0.1.38.dist-info/RECORD,,