syncraft 0.1.36__tar.gz → 0.1.38__tar.gz

{syncraft-0.1.36 → syncraft-0.1.38}/PKG-INFO

@@ -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 → syncraft-0.1.38}/pyproject.toml

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

{syncraft-0.1.36 → syncraft-0.1.38}/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-0.1.36 → syncraft-0.1.38}/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 → syncraft-0.1.38}/syncraft.egg-info/PKG-INFO

@@ -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 → syncraft-0.1.38}/syncraft.egg-info/SOURCES.txt

@@ -21,4 +21,5 @@ tests/test_bimap.py
 tests/test_find.py
 tests/test_parse.py
 tests/test_to.py
-tests/test_until.py
+tests/test_until.py
+tests/test_var.py