omextra 0.0.0.dev496__py3-none-any.whl → 0.0.0.dev498__py3-none-any.whl

omextra/text/abnf/utils.py

@@ -1,62 +1,59 @@
-import itertools
 import textwrap
 import typing as ta
 
 from omlish import check
 
-from .base import Grammar
-from .base import Match
+from .grammars import Channel
+from .grammars import Grammar
+from .matches import Match
+from .matches import filter_matches
 from .ops import RuleRef
 
 
 ##
 
 
-def strip_insignificant_match_rules(m: Match, g: Grammar) -> Match:
-    def rec(c: Match) -> Match:
-        return c.flat_map_children(
-            lambda x: (
-                (rec(x),) if not (
-                    isinstance((xp := x.op), RuleRef) and
-                    check.not_none(g.rule(xp.name)).insignificant
-                ) else ()
-            ),
-        )
-    return rec(m)
+def filter_match_channels(
+        m: Match,
+        g: Grammar,
+        *,
+        keep: ta.Container[Channel] | None = None,
+        remove: ta.Container[Channel] | None = None,
+        keep_children: bool = False,
+) -> Match:
+    if keep is None and remove is None:
+        return m
 
+    def fn(x: Match) -> bool:
+        if not isinstance((rr := x.op), RuleRef):
+            return False
 
-def only_match_rules(m: Match) -> Match:
-    def rec(c: Match) -> ta.Iterable[Match]:
-        if isinstance(c.op, RuleRef):
-            return (c.flat_map_children(rec),)
-        else:
-            return itertools.chain.from_iterable(map(rec, c.children))
-    return m.flat_map_children(rec)
+        r = check.not_none(g.rule(rr.name))
+
+        if keep is not None and r.channel not in keep:
+            return False
+
+        if remove is not None and r.channel in remove:
+            return False
+
+        return True
+
+    return filter_matches(
+        fn,
+        m,
+        keep_children=keep_children,
+    )
 
 
 #
 
 
-def parse_rules(
-        grammar: Grammar,
-        source: str,
-        root: str | None = None,
-        *,
-        start: int = 0,
-        **kwargs: ta.Any,
-) -> Match | None:
-    if (match := grammar.parse(
-            source,
-            root,
-            start=start,
-            **kwargs,
-    )) is None:
-        return None
-
-    match = only_match_rules(match)
-    match = strip_insignificant_match_rules(match, grammar)
-
-    return match
+def only_match_rules(m: Match) -> Match:
+    return filter_matches(
+        lambda x: isinstance(x.op, RuleRef),
+        m,
+        keep_children=True,
+    )
 
 
 ##

omextra/text/abnf/visitors.py

@@ -5,8 +5,8 @@ from omlish import collections as col
 from omlish import dispatch
 from omlish import lang
 
-from .base import Match
 from .base import Op
+from .matches import Match
 from .ops import RuleRef
 
 

{omextra-0.0.0.dev496.dist-info → omextra-0.0.0.dev498.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omextra
-Version: 0.0.0.dev496
+Version: 0.0.0.dev498
 Summary: omextra
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev496
+Requires-Dist: omlish==0.0.0.dev498
 Dynamic: license-file
 
 # Overview

{omextra-0.0.0.dev496.dist-info → omextra-0.0.0.dev498.dist-info}/RECORD

@@ -65,17 +65,20 @@ omextra/sql/parsing/_antlr/MinisqlVisitor.py,sha256=UPs2qA2VlNRP_LMwF0DpMxMir9tI
 omextra/sql/parsing/_antlr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omextra/text/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omextra/text/abnf/LICENSE,sha256=UJzrhSePw9TVm0VfkVmx9NRHkPS1n6jx2UgajTb14ts,1054
-omextra/text/abnf/__init__.py,sha256=nDwr8A5pU8HajHvmAyT8Kr_d_nAUx3tO-ioZXifHob4,1298
-omextra/text/abnf/_dataclasses.py,sha256=YBZeWEvEkYZ8LqJo0MrV5kpKaUWoyLAP7hCT4ziOEh4,18787
-omextra/text/abnf/base.py,sha256=fhZwnsghININSgE7O5NWHBK196LKf_g_xyXwugvR_Vo,7134
-omextra/text/abnf/core.py,sha256=H5U5d-QOI66YSacrLXEcvMQipkabvP8EWo6d9QaxWoU,2283
+omextra/text/abnf/__init__.py,sha256=qCV4I7sMWw2k3B4LnHrURwic2m1ewYdaOteu2n2lx0E,2662
+omextra/text/abnf/_dataclasses.py,sha256=G7fqKpNvWZ-HtdlkwQ_O3IE-eD7-i0Fdq470l2ujM38,29545
+omextra/text/abnf/base.py,sha256=GaNDZxC7rFkbQDTLVFwprtbk_288p7F40zgGkeLiwzY,969
+omextra/text/abnf/core.py,sha256=CO62fK2Ez7XqVkESp_yNfX4iDY8tgph5b9fgmCMam0I,2728
 omextra/text/abnf/errors.py,sha256=uj1oQvRVRlWkMG8mpmcRUg25kICeIJx5EWAVij3pmXc,142
-omextra/text/abnf/internal.py,sha256=PzHIzEEv3H5oLI_hwSmkuOwwzh_BZpvXBjGKYqmPvzs,493
-omextra/text/abnf/meta.py,sha256=IvWdyo8739fCmBwVLzz7VrkScc5DM9uVOKUpEb6-lfM,14504
-omextra/text/abnf/ops.py,sha256=LHF1_NfczSypGb3XhNJIT0zWkIx57lzoZSgSELxUE2E,6063
-omextra/text/abnf/parsing.py,sha256=lDMBPCC-3Rs9XwnW_18E7NMjTSz_gz896u21mv15rvs,6676
-omextra/text/abnf/utils.py,sha256=cpPTGeiVFf1AN4K3KgodsOcarEhFxdEcgxtpRx9xB84,1460
-omextra/text/abnf/visitors.py,sha256=S7ZJ2TmQR_RHJ70xWWt3w6UGRD20uE7Nd5UqFYU593k,1266
+omextra/text/abnf/grammars.py,sha256=PZn7jjzz6p2FGNSjO4OAqmyrAEc8_im17mtsoq3QMa8,5814
+omextra/text/abnf/internal.py,sha256=BltBOKj1uXDxtPgpajt_a6va3Nj7x2SEFRSvevjkIzY,501
+omextra/text/abnf/matches.py,sha256=YsGooPUnrxQsfBgvJoZPkPXKgHNq_HpVsxfzjG6wu-Y,3546
+omextra/text/abnf/meta.py,sha256=7O0WgPKUk6dqQHVGKpVdCX6EAbphj7Gv7GAtkFKcoAY,15151
+omextra/text/abnf/ops.py,sha256=gwN9kxsFmXh3CPN8bTXzDVP775d8hnYFiay4mRijfxc,8068
+omextra/text/abnf/opto.py,sha256=4S97lkk_n4DWjvHqFvapKyMqWbI1voBS4Fhm7bdn3ks,6743
+omextra/text/abnf/parsing.py,sha256=6WGn21gzFJlmVwOzJDD30YkpwXSVuLZlJNk7sGbZOik,9760
+omextra/text/abnf/utils.py,sha256=EXyG5lZ561keeH5XFEePaH4UGa2wW-Aw2t9lE6aCJCc,1261
+omextra/text/abnf/visitors.py,sha256=5Or7Tht5JqNAfoICLmeAXJEZV-nWyMIybvvYcSpNHEc,1269
 omextra/text/abnf/docs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omextra/text/abnf/docs/rfc5234.txt,sha256=I478qv82TBjP29ZpQT-D6_pb3rHOU6wiwN2ZMGiXLLU,26352
 omextra/text/abnf/docs/rfc7405.txt,sha256=Bwt1VISu7eBvlPox9a0iuVD_uCF39teXrEMUQAuuvqU,6661
@@ -152,9 +155,9 @@ omextra/text/antlr/cli/__main__.py,sha256=ckYkj0drxabBVwWYewH2SS36TTeAxllZtS4xEl
 omextra/text/antlr/cli/cli.py,sha256=LW8pJNmySBOV3g8QxquPjUgxFv7YblzEyi555hHH3_M,1234
 omextra/text/antlr/cli/consts.py,sha256=HUYJP9j4RfeuuQv6HFd2oFMS0piWJ9Sq1tbeAs4OlBc,290
 omextra/text/antlr/cli/gen.py,sha256=HYleVptrpynwcl6GspX6O9_oMRSxwdYAQGuUFfDYse8,5236
-omextra-0.0.0.dev496.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omextra-0.0.0.dev496.dist-info/METADATA,sha256=6sf1j4HqLxz1VaR6VxOC4dVNrH97Z0YP0YZZNVgudXc,1409
-omextra-0.0.0.dev496.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omextra-0.0.0.dev496.dist-info/entry_points.txt,sha256=-MFAMks5HgZ60Ore0Wl5lKVKk8z4kf1Ls3WY9E_OlCU,37
-omextra-0.0.0.dev496.dist-info/top_level.txt,sha256=o1nCNRejLMcayDngLuWMWwaeOucz33BXbpuoVvvzjPc,8
-omextra-0.0.0.dev496.dist-info/RECORD,,
+omextra-0.0.0.dev498.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omextra-0.0.0.dev498.dist-info/METADATA,sha256=7xPp8WGYYfw-EBkMVoR8c3-1VlMOkQKAOZK3ZJtGgJ0,1409
+omextra-0.0.0.dev498.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omextra-0.0.0.dev498.dist-info/entry_points.txt,sha256=-MFAMks5HgZ60Ore0Wl5lKVKk8z4kf1Ls3WY9E_OlCU,37
+omextra-0.0.0.dev498.dist-info/top_level.txt,sha256=o1nCNRejLMcayDngLuWMWwaeOucz33BXbpuoVvvzjPc,8
+omextra-0.0.0.dev498.dist-info/RECORD,,