syncraft 0.1.30__py3-none-any.whl → 0.1.32__py3-none-any.whl

syncraft/algebra.py

@@ -5,12 +5,15 @@ from typing import (
 )
 
 import traceback
-from dataclasses import dataclass, replace, asdict
+from dataclasses import dataclass, replace
 from weakref import WeakKeyDictionary
 from abc import ABC
-from syncraft.ast import ThenKind, Then, Choice, Many, ChoiceKind
+from syncraft.ast import ThenKind, Then, Choice, Many, ChoiceKind, shallow_dict
 from syncraft.constraint import Bindable
 
+
+
+
 S = TypeVar('S', bound=Bindable)
     
 A = TypeVar('A')  # Result type
@@ -64,7 +67,7 @@ class Error:
         lst = []
         current: Optional[Error] = self
         while current is not None:
-            d = asdict(current)
+            d = shallow_dict(current)
             lst.append({k:v for k,v in d.items() if v is not None and k != 'previous'})
             current = current.previous
         return lst

syncraft/ast.py

@@ -4,14 +4,20 @@ from __future__ import annotations
 import re
 from typing import (
     Optional, Any, TypeVar, Tuple, runtime_checkable, cast,
-    Generic, Callable, Union, Protocol, Type, List, ClassVar
+    Generic, Callable, Union, Protocol, Type, List, ClassVar,
+    Dict
 )
 
 
-from dataclasses import dataclass, replace, is_dataclass, asdict, fields
+from dataclasses import dataclass, replace, is_dataclass, fields
 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)}"
+    return {f.name: getattr(a, f.name) for f in fields(a)}
+
+
 
 
 A = TypeVar('A')
@@ -182,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:
@@ -220,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
 
@@ -287,37 +298,42 @@ class Collect(Generic[A, E], AST):
     collector: Collector
     value: A
     def bimap(self, r: Bimap[A, B]=Bimap.identity()) -> Tuple[B | E, Callable[[B | E], Collect[A, E]]]:
-        b, inner_f = r(self.value)
-        if isinstance(self.value, Then) and self.value.kind == ThenKind.BOTH:
-            assert isinstance(b, tuple), f"Expected tuple from Then.BOTH combinator, got {type(b)}"
-            index: List[str | int] = []
-            named_count = 0
-            for i, v in enumerate(b):
-                if isinstance(v, Marked):
-                    index.append(v.name)
-                    named_count += 1
-                else:
-                    index.append(i - named_count)
-            named = {v.name: v.value for v in b if isinstance(v, Marked)}
-            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)}"
-                named_dict = asdict(e)     
-                unnamed = []           
-                for f in fields(e):
-                    if f.name not in named:
-                        unnamed.append(named_dict[f.name])
-                tmp = []
-                for x in index:
-                    if isinstance(x, str):
-                        tmp.append(Marked(name=x, value=named_dict[x]))
+
+        def inv_one_positional(e: E) -> B:
+            assert is_dataclass(e), f"Expected dataclass instance for collector inverse, got {type(e)}"
+            named_dict = shallow_dict(e)
+            return named_dict[fields(e)[0].name]
+
+        b, inner_f = self.value.bimap(r) if isinstance(self.value, AST) else r(self.value) 
+        if isinstance(self.value, Then):
+            if isinstance(b, tuple):
+                index: List[str | int] = []
+                named_count = 0
+                for i, v in enumerate(b):
+                    if isinstance(v, Marked):
+                        index.append(v.name)
+                        named_count += 1
                     else:
-                        tmp.append(unnamed[x])
-                return tuple(tmp)
-            return ret, lambda e: replace(self, value=inner_f(invf(e))) # type: ignore
-        else:
-            return b, lambda e: replace(self, value=inner_f(e)) # type: ignore
+                        index.append(i - named_count)
+                named = {v.name: v.value for v in b if isinstance(v, Marked)}
+                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)}"
+                    named_dict = shallow_dict(e)     
+                    unnamed = []           
+                    for f in fields(e):
+                        if f.name not in named:
+                            unnamed.append(named_dict[f.name])
+                    tmp = []
+                    for x in index:
+                        if isinstance(x, str):
+                            tmp.append(Marked(name=x, value=named_dict[x]))
+                        else:
+                            tmp.append(unnamed[x])
+                    return tuple(tmp)
+                return ret, lambda e: replace(self, value=inner_f(invf(e))) # type: ignore                
+        return self.collector(b), lambda e: replace(self, value=inner_f(inv_one_positional(e))) # type: ignore
 
 #########################################################################################################################
 @dataclass(frozen=True)

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
@@ -165,8 +165,29 @@ class Syntax(Generic[A, S]):
     def between(self, left: Syntax[B, S], right: Syntax[C, S]) -> Syntax[Then[B, Then[A, C]], S]:
         return left >> self // right
 
-    def sep_by(self, sep: Syntax[B, S]) -> Syntax[Then[A, Choice[Many[Then[B, A]], Optional[Nothing]]], 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[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:
+                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',
@@ -191,17 +212,11 @@ class Syntax(Generic[A, S]):
         other = other if isinstance(other, Syntax) else self.lift(other).as_(Syntax[B, S])
         ret: Syntax[Then[A, B], S] = self.__class__(lambda cls: self.alg(cls).then_left(other.alg(cls))) # type: ignore
         return ret.describe(name=ThenKind.LEFT.value, fixity='infix', parameter=(self, other)).as_(Syntax[Then[A, B], S]) 
-
-    def __lshift__(self, other: Syntax[B, S]) -> Syntax[Then[A, B], S]:
-        return self.__floordiv__(other)
-
+    
     def __rfloordiv__(self, other: Syntax[B, S]) -> Syntax[Then[B, A], S]:
         other = other if isinstance(other, Syntax) else self.lift(other).as_(Syntax[B, S])
         return other.__floordiv__(self)
         
-    def __rlshift__(self, other: Syntax[B, S]) -> Syntax[Then[B, A], S]:
-        return self.__rfloordiv__(other)
-
     def __add__(self, other: Syntax[B, S]) -> Syntax[Then[A, B], S]:
         other = other if isinstance(other, Syntax) else self.lift(other).as_(Syntax[B, S])
         ret: Syntax[Then[A, B], S] = self.__class__(lambda cls: self.alg(cls).then_both(other.alg(cls))) # type: ignore
@@ -260,16 +275,16 @@ class Syntax(Generic[A, S]):
         return self.bimap(to_f, ito_f).describe(name=f'to({f})', fixity='postfix', parameter=(self,))
 
 
-    def mark(self, var: str) -> Syntax[Marked[A], S]:
+    def mark(self, name: str) -> Syntax[Marked[A], S]:
         def bind_s(value: A) -> Marked[A]:
             if isinstance(value, Marked):
-                return replace(value, name=var)    
+                return replace(value, name=name)    
             else:
-                return Marked(name=var, value=value)
+                return Marked(name=name, value=value)
         def ibind_s(m : Marked[A]) -> A:
             return m.value if isinstance(m, Marked) else m
             
-        return self.bimap(bind_s, ibind_s).describe(name=f'bind("{var}")', fixity='postfix', parameter=(self,))
+        return self.bimap(bind_s, ibind_s).describe(name=f'bind("{name}")', fixity='postfix', parameter=(self,))
 
 
 

{syncraft-0.1.30.dist-info → syncraft-0.1.32.dist-info}/METADATA

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

{syncraft-0.1.30.dist-info → syncraft-0.1.32.dist-info}/RECORD

@@ -1,6 +1,6 @@
 syncraft/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-syncraft/algebra.py,sha256=gXs4rD6Inp6kGf5Vd5kHGgmb2K_qFlWFQ09i7tmcCmo,15662
-syncraft/ast.py,sha256=MSzEvpXoEPxbLX_tYwKbvNEpPzyGc22-poGtHsc1S30,13747
+syncraft/algebra.py,sha256=0bf_kT4b5FeF6isxNESZPbv_nzhDAbbMEID7S0RMJmQ,15677
+syncraft/ast.py,sha256=4EzHOa72UzI3nehFkYZmgz3ex7l7zwiyhy75bchppNI,14454
 syncraft/constraint.py,sha256=uT-ELzvv8J-s-Y1VYkXePUezseqCLhqzYUzFBYs0HsE,6418
 syncraft/diagnostic.py,sha256=cgwcQnCcgrCRX3h-oGTDb5rcJAtitPV3LfH9eLvO93E,2837
 syncraft/finder.py,sha256=L75A0bAjdlntWk-Y1rCeINBOzGeGdE_zHrTmcpQ7m9g,1875
@@ -8,9 +8,9 @@ syncraft/generator.py,sha256=C3N0Nxk9grN6iPxLHt1Ur2xzS5S-9LsNvMMc-ehd36E,12981
 syncraft/parser.py,sha256=RkQwFv00rOI-n4kvG4baGVTdK46T-_Hw7OJ0FB7g72g,11379
 syncraft/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 syncraft/sqlite3.py,sha256=Pq09IHZOwuWg5W82l9D1flzd36QV0TOHQpTJ5U02V8g,34701
-syncraft/syntax.py,sha256=a3g-qcTHpIicMO0KseHuKe5liNfYawLRO-M1eCBS6d4,16574
-syncraft-0.1.30.dist-info/licenses/LICENSE,sha256=wHSV424U5csa3339dy1AZbsz2xsd0hrkMx2QK48CcUk,1062
-syncraft-0.1.30.dist-info/METADATA,sha256=hS0hq05nMjQnQTPDCeFxrvlkybCLjdsowLHLayIgHJE,1041
-syncraft-0.1.30.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-syncraft-0.1.30.dist-info/top_level.txt,sha256=Kq3t8ESXB2xW1Xt3uPmkENFc-c4f2pamNmaURBk7zc8,9
-syncraft-0.1.30.dist-info/RECORD,,
+syncraft/syntax.py,sha256=ZqprL1EB8NFusM0Pcz9_uufLL4RTyzUAvMLkG14dOvU,17704
+syncraft-0.1.32.dist-info/licenses/LICENSE,sha256=wHSV424U5csa3339dy1AZbsz2xsd0hrkMx2QK48CcUk,1062
+syncraft-0.1.32.dist-info/METADATA,sha256=6jkJsi6ayD-miCVzm2Xm2hK385HkbfZeaAOUBTwhyp4,1041
+syncraft-0.1.32.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+syncraft-0.1.32.dist-info/top_level.txt,sha256=Kq3t8ESXB2xW1Xt3uPmkENFc-c4f2pamNmaURBk7zc8,9
+syncraft-0.1.32.dist-info/RECORD,,