syncraft 0.2.6__tar.gz → 0.2.7__tar.gz

{syncraft-0.2.6/syncraft.egg-info → syncraft-0.2.7}/PKG-INFO

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

{syncraft-0.2.6 → syncraft-0.2.7}/pyproject.toml

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

{syncraft-0.2.6 → syncraft-0.2.7}/syncraft/algebra.py

@@ -103,10 +103,10 @@ class Algebra(Generic[A, S]):
              cache: Cache) -> Algebra[A, S]:
         def algebra_lazy_run(input: S, use_cache:bool) -> Generator[Incomplete[S], S, Either[Any, Tuple[A, S]]]:
             alg = thunk()
-            print('--' * 20, "Algebra.lazy.algebra_lazy_run", '--' * 20)
-            print('thunk', thunk, id(thunk))
-            print('input', input, id(input))
-            print('alg', alg, id(alg))
+            # print('--' * 20, "Algebra.lazy.algebra_lazy_run", '--' * 20)
+            # print('thunk', thunk, id(thunk))
+            # print('input', input, id(input))
+            # print('alg', alg, id(alg))
             result = yield from alg.run(input, use_cache)
             return result
         return cls(algebra_lazy_run, name=cls.__name__ + '.lazy', cache=cache)

{syncraft-0.2.6 → syncraft-0.2.7}/syncraft/syntax.py

@@ -566,10 +566,10 @@ def lazy(thunk: Callable[[], Syntax[A, S]]) -> Syntax[A, S]:
     algebra: Optional[Algebra[A, S]] = None
     def syntax_lazy_run(cls: Type[Algebra[Any, S]], cache: Cache) -> Algebra[A, S]:
         nonlocal syntax, algebra
-        print('==' * 20, 'Syntax.lazy.syntax_lazy_run', '==' * 20)
-        print('thunk', thunk, id(thunk))
-        print('syntax', syntax, id(syntax))
-        print('algebra', algebra, id(algebra))
+        # print('==' * 20, 'Syntax.lazy.syntax_lazy_run', '==' * 20)
+        # print('thunk', thunk, id(thunk))
+        # print('syntax', syntax, id(syntax))
+        # print('algebra', algebra, id(algebra))
         if syntax is None:
             syntax = thunk()
         def algebra_lazy_f():

{syncraft-0.2.6 → syncraft-0.2.7/syncraft.egg-info}/PKG-INFO

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

syncraft-0.2.7/tests/test_lazy.py

@@ -0,0 +1,107 @@
+from __future__ import annotations
+from syncraft.parser import token
+import pytest
+from syncraft.walker import walk
+from syncraft.ast import Nothing
+from syncraft.syntax import lazy, literal, regex
+from syncraft.parser import parse
+from syncraft.generator import TokenGen
+from syncraft.cache import RecursionError
+from rich import print
+
+def test_simple_recursion()->None:
+    A = lazy(lambda: literal('a') + ~A | literal('a'))
+    v, s = parse(A, 'a a a', dialect='sqlite')
+    print(v)
+    ast1, inv = v.bimap()
+    print(ast1)
+    assert ast1 == (
+        TokenGen.from_string('a'), 
+        (
+            TokenGen.from_string('a'), 
+            (
+                TokenGen.from_string('a'), 
+                Nothing()
+            )
+        )
+    )
+
+def test_direct_recursion()->None:
+    Expr1 = lazy(lambda: literal('a') + ~Expr1)
+    v, s = parse(Expr1, 'a a a', dialect='sqlite')
+    x, _ = v.bimap()
+    assert x == (
+        TokenGen.from_string('a'), 
+        (
+            TokenGen.from_string('a'), 
+            (
+                TokenGen.from_string('a'), 
+                Nothing()
+            )
+        )
+    )
+
+
+def test_mutual_recursion()->None:
+    A = lazy(lambda: literal('a') + B)
+    B = lazy(lambda: (literal('b') + A) | (literal('c')))
+    v, s = parse(A, 'a b a b a c', dialect='sqlite')
+    print('--' * 20, "test_mutual_recursion", '--' * 20)
+    print(v)
+    ast1, inv = v.bimap()
+    print(ast1)
+    assert ast1 == (
+        TokenGen.from_string('a'), 
+        (
+            TokenGen.from_string('b'), 
+            TokenGen.from_string('a'), 
+            (
+                TokenGen.from_string('b'), 
+                TokenGen.from_string('a'), 
+                TokenGen.from_string('c')
+            )
+        )
+    )
+
+
+
+def test_recursion() -> None:
+    A = literal('a')
+    B = literal('b')
+    L = lazy(lambda: literal("if") >> (A | B) // literal('then'))
+
+    def parens():
+        return A + ~lazy(parens) + B
+    p_code = 'a a b b'
+    LL = parens() | L
+    
+    v, s = parse(LL, p_code, dialect='sqlite')
+    ast1, inv = v.bimap()
+    print(v)
+    print(ast1)
+    assert ast1 == (
+            TokenGen.from_string('a'), 
+            (
+                TokenGen.from_string('a'), 
+                Nothing(), 
+                TokenGen.from_string('b')
+            ), 
+            TokenGen.from_string('b')
+        )
+
+def test_direct_left_recursion()->None:
+    Term = literal('n')
+    Expr = lazy(lambda: Expr + literal('+') + Term | Term)
+    with pytest.raises(RecursionError):
+        v, s = parse(Expr, 'n+n+n', dialect='sqlite')
+
+
+
+def test_indirect_left_recursion()->None:
+    NUMBER = regex(r'\d+').map(int)
+    PLUS = token(text='+')
+    STAR = token(text='*')
+    A = lazy(lambda: (B >> PLUS >> A) | B)
+    B = lazy(lambda: (A >> STAR >> NUMBER) | NUMBER)
+    with pytest.raises(RecursionError):
+        v, s = parse(A, '1 + 2 * 3', dialect='sqlite')

syncraft-0.2.6/tests/test_lazy.py

@@ -1,50 +0,0 @@
-from __future__ import annotations
-from syncraft.parser import token
-
-from syncraft.walker import walk
-from syncraft.ast import Nothing
-from syncraft.syntax import lazy, literal, regex
-from syncraft.parser import parse
-from syncraft.generator import TokenGen
-
-from rich import print
-
-
-def test_recursion() -> None:
-    A = literal('a')
-    B = literal('b')
-    L = lazy(lambda: literal("if") >> (A | B) // literal('then'))
-
-    def parens():
-        return A + ~lazy(parens) + B
-    p_code = 'a a b b'
-    LL = parens() | L
-    
-    v, s = parse(LL, p_code, dialect='sqlite')
-    ast1, inv = v.bimap()
-    print(v)
-    print(ast1)
-    assert ast1 == (
-            TokenGen.from_string('a'), 
-            (
-                TokenGen.from_string('a'), 
-                Nothing(), 
-                TokenGen.from_string('b')
-            ), 
-            TokenGen.from_string('b')
-        )
-
-def test_direct_left_recursion()->None:
-    Term = literal('n')
-    Expr = lazy(lambda: Expr + literal('+') + Term | Term)
-    v, s = parse(Expr, 'n+n+n', dialect='sqlite')
-
-
-
-def test_indirect_left_recursion()->None:
-    NUMBER = regex(r'\d+').map(int)
-    PLUS = token(text='+')
-    STAR = token(text='*')
-    A = lazy(lambda: (B >> PLUS >> A) | B)
-    B = lazy(lambda: (A >> STAR >> NUMBER) | NUMBER)
-    v, s = parse(A, '1 + 2 * 3', dialect='sqlite')