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

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/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.dist-info → syncraft-0.1.32.dist-info}/METADATA

@@ -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.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=0bf_kT4b5FeF6isxNESZPbv_nzhDAbbMEID7S0RMJmQ,15677
-syncraft/ast.py,sha256=H9cB1ZLGgKgdYFzOqse_df43nf6cgaA4286Ji0QG_KE,14288
+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=MDdCh_lzW3xB_k0l7WAho8VwS4YDI2yqT9pKRn8ZY40,17293
-syncraft-0.1.31.dist-info/licenses/LICENSE,sha256=wHSV424U5csa3339dy1AZbsz2xsd0hrkMx2QK48CcUk,1062
-syncraft-0.1.31.dist-info/METADATA,sha256=XtidU76uf4Wrwu7fhvudTaCEs1kRDb8MXYNIS9WDbaE,1041
-syncraft-0.1.31.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-syncraft-0.1.31.dist-info/top_level.txt,sha256=Kq3t8ESXB2xW1Xt3uPmkENFc-c4f2pamNmaURBk7zc8,9
-syncraft-0.1.31.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,,