syncraft 0.1.29__tar.gz → 0.1.30__tar.gz

{syncraft-0.1.29 → syncraft-0.1.30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: syncraft
-Version: 0.1.29
+Version: 0.1.30
 Summary: Parser combinator library
 Author-email: Michael Afmokt <michael@esacca.com>
 License-Expression: MIT
@@ -29,8 +29,6 @@ pip install syncraft
 
 
 ## TODO
-- [ ] simplify the result of then_left and then_right by bimap the result in syntax.
-- [ ] simplify the result of sep_by and between by bimap the result in syntax
 - [ ] convert to dict/dataclass via bimap in syntax
 - [ ] define DSL over Variable to construct predicates
 - [ ] Try the parsing, generation, and data processing machinery on SQLite3 syntax. So that I can have direct feedback on the usability of this library and a fully functional SQLite3 library.

{syncraft-0.1.29 → syncraft-0.1.30}/README.md

@@ -14,8 +14,6 @@ pip install syncraft
 
 
 ## TODO
-- [ ] simplify the result of then_left and then_right by bimap the result in syntax.
-- [ ] simplify the result of sep_by and between by bimap the result in syntax
 - [ ] convert to dict/dataclass via bimap in syntax
 - [ ] define DSL over Variable to construct predicates
 - [ ] Try the parsing, generation, and data processing machinery on SQLite3 syntax. So that I can have direct feedback on the usability of this library and a fully functional SQLite3 library.

{syncraft-0.1.29 → syncraft-0.1.30}/pyproject.toml

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

{syncraft-0.1.29 → syncraft-0.1.30}/syncraft.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: syncraft
-Version: 0.1.29
+Version: 0.1.30
 Summary: Parser combinator library
 Author-email: Michael Afmokt <michael@esacca.com>
 License-Expression: MIT
@@ -29,8 +29,6 @@ pip install syncraft
 
 
 ## TODO
-- [ ] simplify the result of then_left and then_right by bimap the result in syntax.
-- [ ] simplify the result of sep_by and between by bimap the result in syntax
 - [ ] convert to dict/dataclass via bimap in syntax
 - [ ] define DSL over Variable to construct predicates
 - [ ] Try the parsing, generation, and data processing machinery on SQLite3 syntax. So that I can have direct feedback on the usability of this library and a fully functional SQLite3 library.

{syncraft-0.1.29 → syncraft-0.1.30}/tests/test_bimap.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from syncraft.ast import Then, ThenKind, Many, Choice, ChoiceKind, Token
+from syncraft.ast import Then, ThenKind, Many, Choice, ChoiceKind, Token, Marked, Nothing
 from syncraft.algebra import Error
 from syncraft.parser import literal, parse
 import syncraft.generator as gen
@@ -19,9 +19,9 @@ def test1_simple_then() -> None:
     print("---" * 40)
     print(generated)
     assert ast == generated
-    # value, bmap = generated.bimap()
-    # print(value)
-    # assert bmap(value) == generated
+    value, bmap = generated.bimap()
+    print(value)
+    assert gen.generate(syntax, bmap(value)) == generated
 
 
 def test2_named_results() -> None:
@@ -35,10 +35,9 @@ def test2_named_results() -> None:
     print("---" * 40)
     print(generated)
     assert ast == generated
-    # value, bmap = generated.bimap()
-    # print(value)
-    # print(bmap(value))
-    # assert bmap(value) == generated
+    value, bmap = generated.bimap()
+    assert gen.generate(syntax, bmap(value)) == generated
+    
 
 
 def test3_many_literals() -> None:
@@ -52,9 +51,8 @@ def test3_many_literals() -> None:
     print("---" * 40)
     print(generated)
     assert ast == generated
-    # value, bmap = generated.bimap()
-    # print(value)
-    # assert bmap(value) == generated
+    value, bmap = generated.bimap()
+    assert gen.generate(syntax, bmap(value)) == generated
 
 
 def test4_mixed_many_named() -> None:
@@ -69,9 +67,8 @@ def test4_mixed_many_named() -> None:
     print("---" * 40)
     print(generated)
     assert ast == generated
-    # value, bmap = generated.bimap()
-    # print(value)
-    # assert bmap(value) == generated
+    value, bmap = generated.bimap()
+    assert gen.generate(syntax, bmap(value)) == generated
 
 
 def test5_nested_then_many() -> None:
@@ -85,9 +82,8 @@ def test5_nested_then_many() -> None:
     print("---" * 40)
     print(generated)
     assert ast == generated
-    # value, bmap = generated.bimap()
-    # print(value)
-    # assert bmap(value) == generated
+    value, bmap = generated.bimap()
+    assert gen.generate(syntax, bmap(value), restore_pruned=True) == generated
 
 
 
@@ -99,8 +95,8 @@ def test_then_flatten():
     print(ast)
     generated = gen.generate(syntax, ast)
     assert ast == generated
-    # value, bmap = ast.bimap()
-    # assert bmap(value) == ast    
+    value, bmap = generated.bimap()
+    assert gen.generate(syntax, bmap(value)) == generated
 
 
 
@@ -114,11 +110,8 @@ def test_named_in_then():
     print(ast)
     generated = gen.generate(syntax, ast)
     assert ast == generated
-    # value, bmap = ast.bimap()
-    # assert isinstance(value, tuple)
-    # print(value)
-    # assert set(x.name for x in value if isinstance(x, Marked)) == {"first", "second", "third"}
-    # assert bmap(value) == ast
+    value, bmap = generated.bimap()
+    assert gen.generate(syntax, bmap(value)) == generated
 
 
 def test_named_in_many():
@@ -129,10 +122,8 @@ def test_named_in_many():
     print(ast)
     generated = gen.generate(syntax, ast)
     assert ast == generated
-    # value, bmap = ast.bimap()
-    # assert isinstance(value, list)
-    # assert all(isinstance(v, Marked) for v in value if isinstance(v, Marked))
-    # assert bmap(value) == ast
+    value, bmap = generated.bimap()
+    assert gen.generate(syntax, bmap(value)) == generated
 
 
 def test_named_in_or():
@@ -144,10 +135,8 @@ def test_named_in_or():
     print(ast)
     generated = gen.generate(syntax, ast)
     assert ast == generated
-    # value, bmap = ast.bimap()
-    # assert isinstance(value, Marked)
-    # assert value.name == "b"
-    # assert bmap(value) == ast    
+    value, bmap = generated.bimap()
+    assert gen.generate(syntax, bmap(value)) == generated
 
 
 
@@ -165,8 +154,8 @@ def test_deep_mix():
     print('---' * 40)
     print(generated)
     assert ast == generated
-    # value, bmap = ast.bimap()
-    # assert bmap(value) == ast
+    value, bmap = generated.bimap()
+    assert gen.generate(syntax, bmap(value)) == generated
 
 
 def test_empty_many() -> None:
@@ -183,8 +172,8 @@ def test_backtracking_many() -> None:
     syntax = (A.many() + B)  # must not eat the final "a" needed for B
     sql = "a a a a b"
     ast = parse(syntax, sql, dialect="sqlite")
-    # value, bmap = ast.bimap()
-    # assert value[-1] == TokenGen.from_string("b")
+    value, bmap = ast.bimap()
+    assert gen.generate(syntax, bmap(value)) == ast
 
 def test_deep_nesting() -> None:
     A = literal("a")
@@ -209,9 +198,8 @@ def test_named_many() -> None:
     syntax = A.many()
     sql = "a a"
     ast = parse(syntax, sql, dialect="sqlite")
-    # Expect [Marked("alpha", "a"), Marked("alpha", "a")]
-    # flattened, _ = ast.bimap()
-    # assert all(isinstance(x, Marked) for x in flattened)
+    value, bmap = ast.bimap()
+    assert gen.generate(syntax, bmap(value)) == ast
 
 
 def test_or_named() -> None:
@@ -220,10 +208,8 @@ def test_or_named() -> None:
     syntax = A | B
     sql = "b"
     ast = parse(syntax, sql, dialect="sqlite")
-    # Either Marked("y", "b") or just "b", depending on your design
-    # assert isinstance(ast, Choice)
-    # value, _ = ast.bimap()
-    # assert value == Marked(name="y", value=TokenGen.from_string("b"))
+    value, bmap = ast.bimap()
+    assert gen.generate(syntax, bmap(value)) == ast
 
 
 def test_then_associativity() -> None:
@@ -269,11 +255,11 @@ def test_optional():
     A = literal("a").mark("a")
     syntax = A.optional()
     ast1 = parse(syntax, "", dialect="sqlite")
-    # v1, _ = ast1.bimap()
-    # assert v1 is None
-    # ast2 = parse(syntax, "a", dialect="sqlite")
-    # v2, _ = ast2.bimap()
-    # assert v2 == Marked(name='a', value=TokenGen.from_string('a'))
+    v1, _ = ast1.bimap()
+    assert isinstance(v1, Nothing)
+    ast2 = parse(syntax, "a", dialect="sqlite")
+    v2, _ = ast2.bimap()
+    assert v2 == Marked(name='a', value=TokenGen.from_string('a'))
 
 
 

{syncraft-0.1.29 → syncraft-0.1.30}/tests/test_parse.py

@@ -16,6 +16,8 @@ def test_between()->None:
     ast:AST = parse(syntax, sql, dialect='sqlite')    
     generated = gen.generate(syntax, ast)
     assert ast == generated, "Parsed and generated results do not match."
+    x, f = generated.bimap()
+    assert gen.generate(syntax, f(x)) == ast
 
 
 def test_sep_by()->None:
@@ -24,6 +26,8 @@ def test_sep_by()->None:
     ast:AST = parse(syntax, sql, dialect='sqlite')    
     generated = gen.generate(syntax, ast)
     assert ast == generated, "Parsed and generated results do not match."
+    x, f = generated.bimap()
+    assert gen.generate(syntax, f(x)) == ast
 
 def test_many_or()->None:
     IF = literal("if")
@@ -34,3 +38,5 @@ def test_many_or()->None:
     ast:AST = parse(syntax, sql, dialect='sqlite')
     generated = gen.generate(syntax, ast)
     assert ast == generated, "Parsed and generated results do not match."
+    x, f = generated.bimap()
+    assert gen.generate(syntax, f(x)) == ast