syncraft 0.2.8__tar.gz → 0.2.9__tar.gz

{syncraft-0.2.8/syncraft.egg-info → syncraft-0.2.9}/PKG-INFO

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

{syncraft-0.2.8 → syncraft-0.2.9}/pyproject.toml

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

{syncraft-0.2.8 → syncraft-0.2.9}/syncraft/ast.py

@@ -488,7 +488,7 @@ class ChoiceSpec(SyntaxSpec, Generic[A, B]):
 
 @dataclass(frozen=True)
 class LazySpec(SyntaxSpec, Generic[A]):
-    value: A
+    value: None | A
 @dataclass(frozen=True)
 class ThenSpec(SyntaxSpec, Generic[A, B]):
     kind: ThenKind

{syncraft-0.2.8 → syncraft-0.2.9}/syncraft/cache.py

@@ -70,7 +70,7 @@ class Cache(Generic[Ret]):
         if key in c:
             v = c[key]
             if isinstance(v, InProgress):
-                raise RecursionError("Left-recursion detected in parser", offending=f, state=args)
+                raise RecursionError(f"Left-recursion detected in Algebra {f}", offending=f, state=args)
             else:
                 return v        
         try:
@@ -98,7 +98,7 @@ class Cache(Generic[Ret]):
         if key in c:
             v = c[key]
             if isinstance(v, InProgress):
-                raise RecursionError("Left-recursion detected in parser", offending=f, state=args)
+                raise RecursionError(f"Left-recursion detected in Algebra {f}", offending=f, state=args)
             else:
                 return v        
         try:

{syncraft-0.2.8 → syncraft-0.2.9}/syncraft/walker.py

@@ -13,7 +13,7 @@ from syncraft.constraint import Bindable, FrozenDict
 
 import re
 from syncraft.syntax import Syntax
-from syncraft.cache import Cache
+from syncraft.cache import Cache, RecursionError
 from rich import print
 
 
@@ -23,17 +23,11 @@ B = TypeVar('B')
 SS = TypeVar('SS', bound=Hashable)
 
 
-
-
-
-
-
 @dataclass(frozen=True)
 class WalkerState(Bindable, Generic[SS]):
     reducer: Optional[Callable[[Any, SS], SS]] = None
     acc: Optional[SS] = None
 
-
     def reduce(self, value: Any) -> WalkerState[SS]:
         if self.reducer:
             new_acc = self.reducer(value, self.acc) if self.acc is not None else value
@@ -42,9 +36,6 @@ class WalkerState(Bindable, Generic[SS]):
             return replace(self, acc=value)
         
 
-
-
-
 @dataclass(frozen=True)
 class Walker(Algebra[SS, WalkerState[SS]]):
     @classmethod
@@ -75,16 +66,19 @@ class Walker(Algebra[SS, WalkerState[SS]]):
              cache: Cache) -> Algebra[Any, WalkerState[SS]]:
         def algebra_lazy_run(input: WalkerState[SS], use_cache:bool) -> PyGenerator[Incomplete[WalkerState[SS]], WalkerState[SS], Either[Any, Tuple[Any, WalkerState[SS]]]]:
             alg = thunk()
-            print('--' * 20, "Walker.lazy.algebra_lazy_run", '--' * 20)
-            print('thunk', thunk, id(thunk))
-            print('input', input, id(input))
-            print('alg', alg, id(alg))
-            thunk_result = yield from alg.run(input, use_cache)
-            match thunk_result:
-                case Right((value, from_thunk)):
-                    data = LazySpec(value=value)
-                    return Right((data, from_thunk.reduce(data)))
-            raise SyncraftError("flat_map should always return a value or an error.", offending=thunk_result, expect=(Left, Right))
+            # print('--' * 20, "Walker.lazy.algebra_lazy_run", '--' * 20)
+            # print('thunk', thunk, id(thunk))
+            # print('input', input, id(input))
+            # print('alg', alg, id(alg))
+            try:
+                thunk_result = yield from alg.run(input, use_cache)
+                match thunk_result:
+                    case Right((value, from_thunk)):
+                        data: LazySpec[Any] = LazySpec(value=value)
+                        return Right((data, from_thunk.reduce(data)))
+                raise SyncraftError("flat_map should always return a value or an error.", offending=thunk_result, expect=(Left, Right))
+            except RecursionError as e:
+                return Right((LazySpec(value=None), input))
         return cls(algebra_lazy_run, name=cls.__name__ + '.lazy', cache=cache)
 
 
@@ -137,7 +131,17 @@ class Walker(Algebra[SS, WalkerState[SS]]):
 
 
 
-def walk(syntax: Syntax[Any, Any], reducer: Callable[[Any, Any], SS], init: SS)-> Tuple[Any, None | SS]:
+def walk(syntax: Syntax[Any, Any], reducer: Optional[Callable[[Any, Any], SS]] = None, init: Optional[SS] = None) -> Any:
     from syncraft.syntax import run
-    v, s = run(syntax=syntax, alg=Walker, use_cache=False, reducer=reducer, init=init)
-    return v, s
+    v, s = run(syntax=syntax, 
+               alg=Walker, 
+               use_cache=True, 
+               reducer=reducer or (lambda a, s: s), 
+               init=init)
+    if reducer is None:
+        return v
+    else:
+        if s is not None:
+            return s.acc
+        else:
+            return None

{syncraft-0.2.8 → syncraft-0.2.9/syncraft.egg-info}/PKG-INFO

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