syncraft 0.1.34__tar.gz → 0.1.35__tar.gz

{syncraft-0.1.34 → syncraft-0.1.35}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: syncraft
-Version: 0.1.34
+Version: 0.1.35
 Summary: Parser combinator library
 Author-email: Michael Afmokt <michael@esacca.com>
 License-Expression: MIT
@@ -29,7 +29,6 @@ pip install syncraft
 
 
 ## TODO
-- [ ] 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.
 - [ ] Make the library as fast as possible and feasible.

{syncraft-0.1.34 → syncraft-0.1.35}/README.md

@@ -14,7 +14,6 @@ pip install syncraft
 
 
 ## TODO
-- [ ] 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.
 - [ ] Make the library as fast as possible and feasible.

{syncraft-0.1.34 → syncraft-0.1.35}/pyproject.toml

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

{syncraft-0.1.34 → syncraft-0.1.35}/syncraft/algebra.py

@@ -48,6 +48,7 @@ class Error:
     error: Optional[Any] = None    
     state: Optional[Any] = None
     committed: bool = False
+    stack: Optional[str] = None
     previous: Optional[Error] = None
     
     def attach( self, 
@@ -115,14 +116,15 @@ class Algebra(ABC, Generic[A, S]):
                     result = Left(result.value.attach(this=self, state=input))
         except Exception as e:
             cache.pop(input, None)  # Clear the cache entry on exception
-            traceback.print_exc()
-            print(f"Exception from self.run(S): {e}")
+            # traceback.print_exc()
+            # print(f"Exception from self.run(S): {e}")
             return Left(
                 Error(
                     message="Exception from self.run(S): {e}",
                     this=self,
                     state=input,
-                    error=e
+                    error=e,
+                    stack=traceback.format_exc()
                 ))
         return result
 
@@ -341,8 +343,8 @@ class Algebra(ABC, Generic[A, S]):
         return self.flat_map(then_right_f).named(f'{self.name} >> {other.name}')
 
     def many(self, *, at_least: int, at_most: Optional[int]) -> Algebra[Many[A], S]:
-        assert at_least > 0, "at_least must be greater than 0"
-        assert at_most is None or at_least <= at_most, "at_least must be less than or equal to at_most"
+        if at_least <=0 or (at_most is not None and at_most < at_least):
+            raise ValueError(f"Invalid arguments for many: at_least={at_least}, at_most={at_most}")
         def many_run(input: S, use_cache:bool) -> Either[Any, Tuple[Many[A], S]]:
             ret: List[A] = []
             current_input = input

{syncraft-0.1.34 → syncraft-0.1.35}/syncraft/ast.py

@@ -14,7 +14,8 @@ from enum import Enum
 
 
 def shallow_dict(a: Any)->Dict[str, Any]:
-    assert is_dataclass(a), f"Expected dataclass instance for collector inverse, got {type(a)}"
+    if not is_dataclass(a):
+        raise ValueError(f"Expected dataclass instance for collector inverse, got {type(a)}")
     return {f.name: getattr(a, f.name) for f in fields(a)}
 
 
@@ -300,7 +301,8 @@ class Collect(Generic[A, E], AST):
     def bimap(self, r: Bimap[A, B]=Bimap.identity()) -> Tuple[B | E, Callable[[B | E], Collect[A, E]]]:
 
         def inv_one_positional(e: E) -> B:
-            assert is_dataclass(e), f"Expected dataclass instance for collector inverse, got {type(e)}"
+            if not is_dataclass(e):
+                raise ValueError(f"Expected dataclass instance for collector inverse, got {type(e)}")
             named_dict = shallow_dict(e)
             return named_dict[fields(e)[0].name]
 
@@ -319,7 +321,8 @@ class Collect(Generic[A, E], AST):
                 unnamed = [v for v in b if not isinstance(v, Marked)]
                 ret: E = self.collector(*unnamed, **named)
                 def invf(e: E) -> Tuple[Any, ...]:
-                    assert is_dataclass(e), f"Expected dataclass instance for collector inverse, got {type(e)}"
+                    if not is_dataclass(e):
+                        raise ValueError(f"Expected dataclass instance for collector inverse, got {type(e)}")
                     named_dict = shallow_dict(e)     
                     unnamed = []           
                     for f in fields(e):

{syncraft-0.1.34 → syncraft-0.1.35}/syncraft/constraint.py

@@ -55,7 +55,8 @@ class Variable:
             object.__setattr__(self, '_root', self)
 
     def raw(self, b:'BoundVar') -> Tuple[Any, ...]:
-        assert self._root is not None, "_rawf can not be None"
+        if self._root is None:
+            raise ValueError("_rawf can not be None")
         return b.get(self._root, ())
     
 

{syncraft-0.1.34 → syncraft-0.1.35}/syncraft/generator.py

@@ -174,8 +174,8 @@ class Generator(Algebra[ParseResult[T], GenState[T]]):
 
 
     def many(self, *, at_least: int, at_most: Optional[int]) -> Algebra[Many[ParseResult[T]], GenState[T]]:
-        assert at_least > 0, "at_least must be greater than 0"
-        assert at_most is None or at_least <= at_most, "at_least must be less than or equal to at_most"
+        if at_least <=0 or (at_most is not None and at_most < at_least):
+            raise ValueError(f"Invalid arguments for many: at_least={at_least}, at_most={at_most}")
         def many_run(input: GenState[T], use_cache:bool) -> Either[Any, Tuple[Many[ParseResult[T]], GenState[T]]]:
             if input.pruned:
                 upper = at_most if at_most is not None else at_least + 2

{syncraft-0.1.34 → syncraft-0.1.35}/syncraft/syntax.py

@@ -178,7 +178,8 @@ class Syntax(Generic[A, S]):
                     raise ValueError(f"Bad data shape {a}")
                 
         def i(a: Many[A]) -> Then[A, Choice[Many[Then[B|None, A]], Optional[Nothing]]]:
-            assert len(a.value) >= 1, f"sep_by expect at least one element, got {len(a.value)}. {a}"
+            if not isinstance(a, Many) or len(a.value) < 1:
+                raise ValueError(f"sep_by inverse expect Many with at least one element, got {a}")
             if len(a.value) == 1:
                 return Then(kind=ThenKind.BOTH, left=a.value[0], right=Choice(kind=ChoiceKind.RIGHT, value=Nothing()))
             else:

{syncraft-0.1.34 → syncraft-0.1.35}/syncraft.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: syncraft
-Version: 0.1.34
+Version: 0.1.35
 Summary: Parser combinator library
 Author-email: Michael Afmokt <michael@esacca.com>
 License-Expression: MIT
@@ -29,7 +29,6 @@ pip install syncraft
 
 
 ## TODO
-- [ ] 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.
 - [ ] Make the library as fast as possible and feasible.

{syncraft-0.1.34 → syncraft-0.1.35}/syncraft.egg-info/SOURCES.txt

@@ -18,6 +18,7 @@ syncraft.egg-info/dependency_links.txt
 syncraft.egg-info/requires.txt
 syncraft.egg-info/top_level.txt
 tests/test_bimap.py
+tests/test_find.py
 tests/test_parse.py
 tests/test_to.py
 tests/test_until.py

syncraft-0.1.35/tests/test_find.py

@@ -0,0 +1,47 @@
+from __future__ import annotations
+from typing import Any, List, Tuple
+from syncraft.algebra import Either, Left, Right, Error
+from syncraft.ast import Marked, Then, ThenKind, Many, Nothing
+from syncraft.parser import literal, variable, parse, Parser, Token
+from syncraft.generator import TokenGen
+from rich import print
+import syncraft.generator as gen
+from dataclasses import dataclass
+from syncraft.finder import find, matches, anything
+
+def test_find()->None:
+    @dataclass
+    class IfThenElse:
+        condition: Any
+        then: Any
+        otherwise: Any
+
+    @dataclass
+    class While:
+        condition:Any
+        body:Any
+
+    WHILE = literal("while")
+    IF = literal("if")
+    ELSE = literal("else")
+    THEN = literal("then")
+    END = literal("end")
+    A = literal('a')
+    B = literal('b')
+    C = literal('c')
+    D = literal('d')
+    M = literal(',')
+    var = A | B | C | D
+    condition = var.sep_by(M).mark('condition') 
+    ifthenelse = (IF >> condition
+              // THEN 
+              + var.sep_by(M).mark('then') 
+              // ELSE 
+              + var.sep_by(M).mark('otherwise') 
+              // END).to(IfThenElse).many()
+    syntax = (WHILE >> condition
+            + ifthenelse.mark('body')
+            // ~END).to(While)
+    sql = 'while b if a,b then c,d else a,d end if a,b then c,d else a,d end'
+    ast = parse(syntax, sql, dialect='sqlite')
+    print(ast)