omextra 0.0.0.dev473__py3-none-any.whl → 0.0.0.dev474__py3-none-any.whl

omextra/formats/goyaml/__init__.py

@@ -5,7 +5,7 @@ A *manual*, near-direct, 'lite'-compatible translation of go-yaml (see LICENSE f
 
 The primary reasons for.. doing this.. are as follows:
 
- - Most importantly for '@omlish-lite' usage - yaml parsing is, whether or not we like it, here to stay for things like
+ - Most importantly for '@omlish-lite' usage - yaml parsing is, whether we like it or not, here to stay for things like
    docker-compose - and reading these files in amalgamated scripts like omdev.ci and omdev.pyproject is a hard
    requirement for them.
 
@@ -17,7 +17,7 @@ The primary reasons for.. doing this.. are as follows:
    pile of regexes, but this codebase itself already uses anchors in its compose.yml, at which point (given the
    potential failure modes of automated infra machinery) that's extremely not acceptable.
 
- - Additionally, as giant yaml files are so pervasive these days, it's useful to be able to programmatically parse
+ - Additionally, as giant yaml files are so pervasive these days, it's useful to be able to programmatically parse and
    manipulate them with full, perfect preservation of all stylistic choices, whitespace, comments, etc. This is already
    partially done here by wrapping pyyaml nodes, but it's not complete and very fragile.
 

omextra/text/abnf/__init__.py

@@ -6,6 +6,16 @@ Originally based on library by Charles Yeomans (see LICENSE file):
   https://github.com/declaresub/abnf/tree/561ced67c0a8afc869ad0de5b39dbe4f6e71b0d8/src/abnf
 
 It has however been nearly entirely rewritten.
+
+====
+
+TODO:
+ - cache lol
+ - get greedier
+ - match-powered optimizer
+  - greedily compile regexes
+ - error reporting
+ - codegen
 """
 
 

omextra/text/abnf/base.py

@@ -1,11 +1,3 @@
-"""
-TODO:
- - cache lol
- - get greedier
- - match-powered optimizer
-  - greedily compile regexes
- - error reporting
-"""
 import abc
 import io
 import itertools
@@ -201,6 +193,7 @@ class Grammar(lang.Final):
             root: Rule | str | None = None,
             *,
             start: int = 0,
+            debug: bool = False,
     ) -> ta.Iterator[Match]:
         if root is None:
             if (root := self._root) is None:
@@ -211,7 +204,13 @@ class Grammar(lang.Final):
             else:
                 root = check.in_(check.isinstance(root, Rule), self._rules)
 
-        ctx = _Context(self, source)
+        ctx_cls: type[_Context]
+        if debug:
+            ctx_cls = _DebugContext
+        else:
+            ctx_cls = _Context
+        ctx = ctx_cls(self, source)
+
         return ctx.iter_parse(root._parser, start)  # noqa
 
     def parse(
@@ -220,19 +219,25 @@ class Grammar(lang.Final):
             root: str | None = None,
             *,
             start: int = 0,
+            debug: bool = False,
     ) -> Match | None:
         return longest_match(self.iter_parse(
             source,
             root,
             start=start,
+            debug=debug,
         ))
 
 
 ##
 
 
-class _Context(lang.Final):
-    def __init__(self, grammar: Grammar, source: str) -> None:
+class _Context:
+    def __init__(
+            self,
+            grammar: Grammar,
+            source: str,
+    ) -> None:
         super().__init__()
 
         self._grammar = grammar
@@ -250,6 +255,21 @@ class _Context(lang.Final):
         return parser._iter_parse(self, start)  # noqa
 
 
+class _DebugContext(_Context):
+    _level: int = 0
+
+    def iter_parse(self, parser: Parser, start: int) -> ta.Iterator[Match]:
+        print(f'{"  " * self._level}enter: {parser=} {start=}')
+        try:
+            self._level += 1
+            for m in super().iter_parse(parser, start):  # noqa
+                # print(f'{"  " * (self._level - 1)}match: {parser=} {start=}')
+                yield m
+        finally:
+            self._level -= 1
+            print(f'{"  " * self._level}exit: {parser=} {start=}')
+
+
 ##
 
 

omextra/text/abnf/errors.py

@@ -2,5 +2,9 @@ class AbnfError(Exception):
     pass
 
 
+class AbnfIncompleteParseError(AbnfError):
+    pass
+
+
 class AbnfGrammarParseError(AbnfError):
     pass

omextra/text/abnf/meta.py

@@ -473,6 +473,21 @@ class MetaGrammarRuleVisitor(RuleVisitor[ta.Any]):
         else:
             raise ValueError(m)
 
+    @RuleVisitor.register('repeat')
+    def visit_repeat_rule(self, m: Match) -> ta.Any:
+        s = check.non_empty_str(self._source[m.start:m.end])
+        if s == '*':
+            return Repeat.Times(0)
+        elif '*' in s:
+            check.state(s.count('*') == 1)
+            if s.endswith('*'):
+                return Repeat.Times(int(s[:-1]))
+            else:
+                mi, mx = s.split('*')
+                return Repeat.Times(int(mi), int(mx))
+        else:
+            return Repeat.Times(n := int(s), n)
+
     @RuleVisitor.register('element')
     def visit_element_rule(self, m: Match) -> ta.Any:
         c = self.visit_match(check.single(m.children))
@@ -483,6 +498,40 @@ class MetaGrammarRuleVisitor(RuleVisitor[ta.Any]):
         else:
             raise TypeError(c)
 
+    @RuleVisitor.register('group')
+    def visit_group_rule(self, m: Match) -> ta.Any:
+        return self.visit_match(check.single(m.children))
+
+    @RuleVisitor.register('option')
+    def visit_option_rule(self, m: Match) -> ta.Any:
+        c = self.visit_match(check.single(m.children))
+        return option(check.isinstance(c, Parser))
+
+    @RuleVisitor.register('num-val')
+    def visit_num_val_rule(self, m: Match) -> ta.Any:
+        return self.visit_match(check.single(m.children))
+
+    def _parse_num_val(self, s: str, base: int) -> Parser:
+        if '-' in s:
+            check.not_in('.', s)
+            lo, hi = [chr(int(p, base)) for p in s.split('-')]
+            return literal(lo, hi)
+        elif '.' in s:
+            check.not_in('-', s)
+            cs = [chr(int(p, base)) for p in s.split('.')]
+            return concat(*[literal(c, c) for c in cs])
+        else:
+            c = chr(int(s, base))
+            return literal(c, c)
+
+    @RuleVisitor.register('dec-val')
+    def visit_dec_val_rule(self, m: Match) -> ta.Any:
+        return self._parse_num_val(self._source[m.start + 1:m.end], 10)
+
+    @RuleVisitor.register('hex-val')
+    def visit_hex_val_rule(self, m: Match) -> ta.Any:
+        return self._parse_num_val(self._source[m.start + 1:m.end], 16)
+
     @RuleVisitor.register('char-val')
     def visit_char_val_rule(self, m: Match) -> ta.Any:
         return self.visit_match(check.single(m.children))
@@ -504,48 +553,22 @@ class MetaGrammarRuleVisitor(RuleVisitor[ta.Any]):
         check.state(self._source[m.end - 1] == '"')
         return self.QuotedString(self._source[m.start + 1:m.end - 1])
 
-    @RuleVisitor.register('repeat')
-    def visit_repeat_rule(self, m: Match) -> ta.Any:
-        # !!! FIXME: boneheaded args, repeat(1, c) currently means 1-*, should be exactly 1-1, should explicitly pass
-        #            None for *
-        s = self._source[m.start:m.end]
-        if '*' in s:
-            check.state(s.count('*') == 1)
-            if s.endswith('*'):
-                return Repeat.Times(int(s[:-1]))
-            else:
-                mi, mx = s.split('*')
-                return Repeat.Times(int(mi), int(mx))
-        else:
-            return Repeat.Times(n := int(s), n)
-
-    @RuleVisitor.register('group')
-    def visit_group_rule(self, m: Match) -> ta.Any:
-        return self.visit_match(check.single(m.children))
-
-    @RuleVisitor.register('num-val')
-    def visit_num_val_rule(self, m: Match) -> ta.Any:
-        return self.visit_match(check.single(m.children))
-
-    @RuleVisitor.register('hex-val')
-    def visit_hex_val_rule(self, m: Match) -> ta.Any:
-        s = self._source[m.start + 1:m.end]
-        if '-' in s:
-            lo, hi = [chr(int(p, 16)) for p in s.split('-')]
-            return literal(lo, hi)
-        else:
-            c = chr(int(s, 16))
-            return literal(c, c)
-
 
 def parse_grammar(
         source: str,
         *,
         no_core_rules: bool = False,
+        root: str | None = None,
+        **kwargs: ta.Any,
 ) -> Grammar:
     source = fix_grammar_ws(source)
 
-    if (mg_m := parse_rules(META_GRAMMAR, source)) is None:
+    if (mg_m := parse_rules(
+            META_GRAMMAR,
+            source,
+            complete=True,
+            **kwargs,
+    )) is None:
         raise AbnfGrammarParseError(source)
 
     check.isinstance(mg_m.parser, Repeat)
@@ -556,4 +579,5 @@ def parse_grammar(
     return Grammar(
         *rules,
         *(CORE_RULES if not no_core_rules else []),
+        root=root,
     )

omextra/text/abnf/parsers.py

@@ -242,8 +242,6 @@ def repeat(min: int, max: int | None, child: Parser) -> Repeat:  # noqa
 
 
 def repeat(*args):
-    # !!! FIXME: boneheaded args, repeat(1, c) currently means 1-*, should be exactly 1-1, should explicitly pass
-    #            None for *
     min: int  # noqa
     max: int | None  # noqa
 

omextra/text/abnf/utils.py

@@ -6,6 +6,7 @@ from omlish import check
 
 from .base import Grammar
 from .base import Match
+from .errors import AbnfIncompleteParseError
 from .parsers import RuleRef
 
 
@@ -41,15 +42,22 @@ def parse_rules(
         grammar: Grammar,
         source: str,
         root: str | None = None,
+        *,
+        start: int = 0,
+        complete: bool = False,
         **kwargs: ta.Any,
 ) -> Match | None:
     if (match := grammar.parse(
             source,
             root,
+            start=start,
             **kwargs,
     )) is None:
         return None
 
+    if complete and (match.start, match.end) != (start, len(source)):
+        raise AbnfIncompleteParseError
+
     match = only_match_rules(match)
     match = strip_insignificant_match_rules(match, grammar)
 

{omextra-0.0.0.dev473.dist-info → omextra-0.0.0.dev474.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omextra
-Version: 0.0.0.dev473
+Version: 0.0.0.dev474
 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.dev473
+Requires-Dist: omlish==0.0.0.dev474
 Dynamic: license-file
 
 # Overview

{omextra-0.0.0.dev473.dist-info → omextra-0.0.0.dev474.dist-info}/RECORD

@@ -20,7 +20,7 @@ omextra/collections/hamt/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZ
 omextra/collections/hamt/_hamt.c,sha256=LDYWBuAl4685DbAZICrzO--EfIN8PjHZq0MUJYBAD74,100898
 omextra/formats/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omextra/formats/goyaml/LICENSE,sha256=qkavv9cjd59BFIFOMVMJMrC3FCEIELrBTA-GPhAFkoY,1071
-omextra/formats/goyaml/__init__.py,sha256=HuJqVB6wyqzQcHMRCW9r3ciPnjl3UvhDT-LjRp7kHDo,1817
+omextra/formats/goyaml/__init__.py,sha256=Wf7WukYGHk2Pqep2ZGRzz2ZznXcay0oVVmrqvqgYIoo,1821
 omextra/formats/goyaml/ast.py,sha256=55CyoNRiaDmu6YeKE_PRt51fE7zr35YcTWSDzVRjPRo,69984
 omextra/formats/goyaml/errors.py,sha256=UQfuManw4kOJKnXrV6MjFqt0ZU6KkwZL75KMdQQ6ZyU,949
 omextra/formats/goyaml/parsing.py,sha256=vZotOxOhLTrE9AGfXbSZcDrVC652PJ3K3ageu6aRT6Q,90558
@@ -64,13 +64,13 @@ 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=v1ABrlcdhCB8ezqHZPl3MZ6SYoEZNerGET5MHjFYhP8,967
-omextra/text/abnf/base.py,sha256=oO9e8Rd0kjdjJ6wWtpzIJOcY_E0QgUSAltpuwqWx-aQ,7476
+omextra/text/abnf/__init__.py,sha256=4ckTD1WSkte_7LzO7vvhcZ17uEdSrNdnpkkuJBRJ2BY,1095
+omextra/text/abnf/base.py,sha256=xDlMH9jaGXh2PN4DMR6AIMB-zOU_MVy20BcEd6Bpu4U,8128
 omextra/text/abnf/core.py,sha256=VUD52hKgDsesvPjmhL1UZVXtpYr-EpWyBprdy722YTY,2303
-omextra/text/abnf/errors.py,sha256=z_RMXMYhPwSUb1neJpJG-XUvkSS87uLJEX9p4wmXQfU,88
-omextra/text/abnf/meta.py,sha256=ltiq70jpTB8Ab3jTfqRubmRdI-42SLPXztLk1_EWFLU,13704
-omextra/text/abnf/parsers.py,sha256=BA5XdbiWh4UyabV4-rajSjHBOBXNa6ieTDs9CwM4nRU,9351
-omextra/text/abnf/utils.py,sha256=OWJe9DvSidOLNzkbdUXdLupDKEIDy6TtQFPVjDmyCng,1420
+omextra/text/abnf/errors.py,sha256=uj1oQvRVRlWkMG8mpmcRUg25kICeIJx5EWAVij3pmXc,142
+omextra/text/abnf/meta.py,sha256=1i2AAGZBLEQhF2HUYQPr385qAMMYLEo0dZT-dcH2Gv0,14447
+omextra/text/abnf/parsers.py,sha256=JKRff1lXbjbKokGL5IBG9tnPflrQ0Fd7X--MRcKTdtE,9209
+omextra/text/abnf/utils.py,sha256=UXJ0MlTkigm3cWuKVU1Ao3bVjQKqy6sZgPni1aVgFgk,1667
 omextra/text/abnf/visitors.py,sha256=kAWPmc3fAOLynLoVl_-ciG_TA3XG7HPca9_I1vI4rL0,1288
 omextra/text/antlr/__init__.py,sha256=88bMl_28cfSKslgOkMGYXqALgsHz3KC4LFvAVtzj7k8,89
 omextra/text/antlr/delimit.py,sha256=s0Jlu6oOamtuyWv_V98P0YC7HmgFJBF7GHVsDfMYTdI,3476
@@ -145,9 +145,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.dev473.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omextra-0.0.0.dev473.dist-info/METADATA,sha256=4KrfUl4grgwui8gUkPsKwH83Mo313ZP45Rjibw5Vqhk,1001
-omextra-0.0.0.dev473.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omextra-0.0.0.dev473.dist-info/entry_points.txt,sha256=-MFAMks5HgZ60Ore0Wl5lKVKk8z4kf1Ls3WY9E_OlCU,37
-omextra-0.0.0.dev473.dist-info/top_level.txt,sha256=o1nCNRejLMcayDngLuWMWwaeOucz33BXbpuoVvvzjPc,8
-omextra-0.0.0.dev473.dist-info/RECORD,,
+omextra-0.0.0.dev474.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omextra-0.0.0.dev474.dist-info/METADATA,sha256=urA8Yo0Co_EPdfsAHGrSSZff9wEKE6t3ASadx1mlgvQ,1001
+omextra-0.0.0.dev474.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omextra-0.0.0.dev474.dist-info/entry_points.txt,sha256=-MFAMks5HgZ60Ore0Wl5lKVKk8z4kf1Ls3WY9E_OlCU,37
+omextra-0.0.0.dev474.dist-info/top_level.txt,sha256=o1nCNRejLMcayDngLuWMWwaeOucz33BXbpuoVvvzjPc,8
+omextra-0.0.0.dev474.dist-info/RECORD,,