syncraft 0.1.31__tar.gz → 0.1.32__tar.gz

{syncraft-0.1.31 → syncraft-0.1.32}/PKG-INFO

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

{syncraft-0.1.31 → syncraft-0.1.32}/pyproject.toml

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

{syncraft-0.1.31 → syncraft-0.1.32}/syncraft/ast.py

@@ -188,6 +188,11 @@ class AST:
 
 @dataclass(frozen=True)
 class Nothing(AST):
+    _instance = None
+    def __new__(cls):
+        if cls._instance is None:
+            cls._instance = super(Nothing, cls).__new__(cls)
+        return cls._instance
     def __str__(self)->str:
         return self.__class__.__name__
     def __repr__(self)->str:
@@ -226,8 +231,8 @@ class Many(Generic[A], AST):
             if len(bs) <= len(ret):
                 return Many(value = tuple(ret[i][1](bs[i]) for i in range(len(bs)))) 
             else:
-                half = [ret[i][1](bs[i]) for i in range(len(bs))]
-                tmp = [ret[-1][1](bs[i]) for i in range(len(ret)-1, len(bs))]
+                half = [ret[i][1](bs[i]) for i in range(len(ret))]
+                tmp = [ret[-1][1](bs[i]) for i in range(len(ret), len(bs))]
                 return Many(value = tuple(half + tmp))
         return [v[0] for v in ret], inv
 

{syncraft-0.1.31 → syncraft-0.1.32}/syncraft/syntax.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from typing import (
     Optional, Any, TypeVar, Generic, Callable, Tuple, cast,
-    Type, Literal
+    Type, Literal, List
 )
 from dataclasses import dataclass, field, replace
 from functools import reduce
@@ -168,21 +168,27 @@ class Syntax(Generic[A, S]):
     def sep_by(self, 
                sep: Syntax[B, S]) -> Syntax[Then[A, Choice[Many[Then[B, A]], Optional[Nothing]]], S]:
         ret: Syntax[Then[A, Choice[Many[Then[B, A]], Optional[Nothing]]], S] = (self + (sep >> self).many().optional())
-        def f(a: Then[A, Choice[Many[A], Optional[Nothing]]]) -> Many[A]:
-            if a.right.kind == ChoiceKind.LEFT and isinstance(a.right.value, Many):
-                if len(a.right.value.value) == 0:
-                    return Many(value = (a.left,))
-                else:
-                    return Many(value = (a.left,) + a.right.value.value)
-            else:
-                return Many(value = (a.left,))
-        def i(a: Many[A]) -> Then[A, Choice[Many[A], Optional[Nothing]]]:
+        def f(a: Then[A, Choice[Many[Then[B, A]], Optional[Nothing]]]) -> Many[A]:
+            match a:
+                case Then(kind=ThenKind.BOTH, left=left, right=Choice(kind=ChoiceKind.RIGHT, value=Nothing())):
+                    return Many(value = (left,))
+                case Then(kind=ThenKind.BOTH, left=left, right=Choice(kind=ChoiceKind.LEFT, value=Many(value=bs))):                    
+                    return Many(value = (left,) + tuple([b.right for b in bs]))
+                case _:
+                    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 len(a.value) == 1:
                 return Then(kind=ThenKind.BOTH, left=a.value[0], right=Choice(kind=ChoiceKind.RIGHT, value=Nothing()))
             else:
-                return Then(kind= ThenKind.BOTH, left=a.value[0], right=Choice(kind=ChoiceKind.LEFT, value=Many(value=a.value[1:])))
-        return ret.bimap(f,i).describe( # type: ignore
+                v: List[Then[B|None, A]] = [Then(kind=ThenKind.RIGHT, right=x, left=None) for x in a.value[1:]]
+                return Then(kind= ThenKind.BOTH, 
+                            left=a.value[0], 
+                            right=Choice(kind=ChoiceKind.LEFT, 
+                                         value=Many(value=tuple(v))))
+        ret = ret.bimap(f,i) # type: ignore
+        return ret.describe( 
                     name='sep_by',
                     fixity='prefix',
                     parameter=(self, sep))

{syncraft-0.1.31 → syncraft-0.1.32}/syncraft.egg-info/PKG-INFO

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

{syncraft-0.1.31 → syncraft-0.1.32}/syncraft.egg-info/SOURCES.txt

@@ -19,4 +19,5 @@ syncraft.egg-info/requires.txt
 syncraft.egg-info/top_level.txt
 tests/test_bimap.py
 tests/test_parse.py
+tests/test_to.py
 tests/test_until.py

syncraft-0.1.32/tests/test_to.py

@@ -0,0 +1,51 @@
+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
+
+
+def test_to() -> 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,c,c 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')
+    g = gen.generate(syntax, ast, restore_pruned=True)
+    assert ast == g
+    x, f = g.bimap()
+    print(x)
+    assert gen.generate(syntax, f(x), restore_pruned=True) == ast