omxtra 0.0.0.dev526__tar.gz → 0.0.0.dev528__tar.gz

{omxtra-0.0.0.dev526/omxtra.egg-info → omxtra-0.0.0.dev528}/PKG-INFO

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

{omxtra-0.0.0.dev526 → omxtra-0.0.0.dev528}/omxtra/formats/goyaml/__init__.py

@@ -1,7 +1,7 @@
 """
 A *manual*, near-direct, 'lite'-compatible translation of go-yaml (see LICENSE file):
 
-  https://github.com/goccy/go-yaml/tree/b0ab06985557a2d84913ecba6dda0dbedbd5e154
+  https://github.com/goccy/go-yaml/tree/8dd51ebb7f36f616b85f7b0e54539afa4341f22a
 
 The primary reasons for.. doing this.. are as follows:
 

omxtra-0.0.0.dev528/omxtra/formats/goyaml/_amalg.py

@@ -0,0 +1,6 @@
+# @omlish-lite
+# @omlish-amalg ../../scripts/lib/formats/goyaml.py
+from .parsing import yaml_parse  # noqa
+
+
+##

{omxtra-0.0.0.dev526 → omxtra-0.0.0.dev528}/omxtra/formats/goyaml/ast.py

@@ -11,7 +11,6 @@ from omlish.lite.abstract import Abstract
 from omlish.lite.check import check
 from omlish.lite.dataclasses import dataclass_field_required
 
-from . import tokens
 from .errors import EofYamlError
 from .errors import YamlError
 from .errors import YamlErrorOr
@@ -20,6 +19,9 @@ from .tokens import YamlNumberType
 from .tokens import YamlPosition
 from .tokens import YamlToken
 from .tokens import YamlTokenType
+from .tokens import yaml_detect_line_break_char
+from .tokens import yaml_literal_block_header
+from .tokens import yaml_to_number
 
 
 ##
@@ -240,14 +242,14 @@ class BaseYamlNode(YamlNode, Abstract):
         return None
 
 
-def add_yaml_comment_string(base: str, node: 'CommentGroupYamlNode') -> str:
+def yaml_add_comment_string(base: str, node: 'CommentGroupYamlNode') -> str:
     return f'{base} {node.string()}'
 
 
 ##
 
 
-def read_yaml_node(p: str, node: YamlNode) -> YamlErrorOr[int]:
+def yaml_read_node(p: str, node: YamlNode) -> YamlErrorOr[int]:
     s = node.string()
     read_len = node.read_len()
     remain = len(s) - read_len
@@ -263,7 +265,7 @@ def read_yaml_node(p: str, node: YamlNode) -> YamlErrorOr[int]:
     return size
 
 
-def check_yaml_line_break(t: YamlToken) -> bool:
+def yaml_check_line_break(t: YamlToken) -> bool:
     if t.prev is not None:
         lbc = '\n'
         prev = t.prev
@@ -338,7 +340,7 @@ class YamlAsts:
     @classmethod
     def integer(cls, tk: YamlToken) -> 'IntegerYamlNode':
         v: ta.Any = None
-        if (num := tokens.to_yaml_number(tk.value)) is not None:
+        if (num := yaml_to_number(tk.value)) is not None:
             v = num.value
 
         return IntegerYamlNode(
@@ -350,7 +352,7 @@ class YamlAsts:
     @classmethod
     def float_(cls, tk: YamlToken) -> 'FloatYamlNode':
         v: float = 0.
-        if (num := tokens.to_yaml_number(tk.value)) is not None and num.type == YamlNumberType.FLOAT:
+        if (num := yaml_to_number(tk.value)) is not None and num.type == YamlNumberType.FLOAT:
             if isinstance(num.value, float):
                 v = num.value
 
@@ -526,7 +528,7 @@ class DocumentYamlNode(BaseYamlNode):
 
     # read implements (io.Reader).Read
     def read(self, p: str) -> YamlErrorOr[int]:
-        return read_yaml_node(p, self)
+        return yaml_read_node(p, self)
 
     # type returns DocumentNodeType
     def type(self) -> YamlNodeType:
@@ -567,7 +569,7 @@ class NullYamlNode(ScalarYamlNode, BaseYamlNode):
 
     # read implements(io.Reader).Read
     def read(self, p: str) -> YamlErrorOr[int]:
-        return read_yaml_node(p, self)
+        return yaml_read_node(p, self)
 
     # type returns NullType
     def type(self) -> YamlNodeType:
@@ -592,7 +594,7 @@ class NullYamlNode(ScalarYamlNode, BaseYamlNode):
                 return self.comment.string()
             return ''
         if self.comment is not None:
-            return add_yaml_comment_string('null', self.comment)
+            return yaml_add_comment_string('null', self.comment)
         return self.string_without_comment()
 
     def string_without_comment(self) -> str:
@@ -618,7 +620,7 @@ class IntegerYamlNode(ScalarYamlNode, BaseYamlNode):
 
     # read implements(io.Reader).Read
     def read(self, p: str) -> YamlErrorOr[int]:
-        return read_yaml_node(p, self)
+        return yaml_read_node(p, self)
 
     # type returns IntegerType
     def type(self) -> YamlNodeType:
@@ -639,7 +641,7 @@ class IntegerYamlNode(ScalarYamlNode, BaseYamlNode):
     # String int64 to text
     def string(self) -> str:
         if self.comment is not None:
-            return add_yaml_comment_string(self.token.value, self.comment)
+            return yaml_add_comment_string(self.token.value, self.comment)
         return self.string_without_comment()
 
     def string_without_comment(self) -> str:
@@ -666,7 +668,7 @@ class FloatYamlNode(ScalarYamlNode, BaseYamlNode):
 
     # read implements(io.Reader).Read
     def read(self, p: str) -> YamlErrorOr[int]:
-        return read_yaml_node(p, self)
+        return yaml_read_node(p, self)
 
     # type returns FloatType
     def type(self) -> YamlNodeType:
@@ -687,7 +689,7 @@ class FloatYamlNode(ScalarYamlNode, BaseYamlNode):
     # String float64 to text
     def string(self) -> str:
         if self.comment is not None:
-            return add_yaml_comment_string(self.token.value, self.comment)
+            return yaml_add_comment_string(self.token.value, self.comment)
         return self.string_without_comment()
 
     def string_without_comment(self) -> str:
@@ -774,7 +776,7 @@ class StringYamlNode(ScalarYamlNode, BaseYamlNode):
 
     # read implements(io.Reader).Read
     def read(self, p: str) -> YamlErrorOr[int]:
-        return read_yaml_node(p, self)
+        return yaml_read_node(p, self)
 
     # type returns StringType
     def type(self) -> YamlNodeType:
@@ -801,19 +803,19 @@ class StringYamlNode(ScalarYamlNode, BaseYamlNode):
         if self.token.type == YamlTokenType.SINGLE_QUOTE:
             quoted = _yaml_escape_single_quote(self.value)
             if self.comment is not None:
-                return add_yaml_comment_string(quoted, self.comment)
+                return yaml_add_comment_string(quoted, self.comment)
             return quoted
         elif self.token.type == YamlTokenType.DOUBLE_QUOTE:
             quoted = _yaml_strconv_quote(self.value)
             if self.comment is not None:
-                return add_yaml_comment_string(quoted, self.comment)
+                return yaml_add_comment_string(quoted, self.comment)
             return quoted
 
-        lbc = tokens.yaml_detect_line_break_char(self.value)
+        lbc = yaml_detect_line_break_char(self.value)
         if lbc in self.value:
             # This block assumes that the line breaks in this inside scalar content and the Outside scalar content are
             # the same. It works mostly, but inconsistencies occur if line break characters are mixed.
-            header = tokens.yaml_literal_block_header(self.value)
+            header = yaml_literal_block_header(self.value)
             space = ' ' * (self.token.position.column - 1)
             indent = ' ' * self.token.position.indent_num
             values: ta.List[str] = []
@@ -824,7 +826,7 @@ class StringYamlNode(ScalarYamlNode, BaseYamlNode):
         elif len(self.value) > 0 and (self.value[0] == '{' or self.value[0] == '['):
             return f"'{self.value}'"
         if self.comment is not None:
-            return add_yaml_comment_string(self.value, self.comment)
+            return yaml_add_comment_string(self.value, self.comment)
         return self.value
 
     def string_without_comment(self) -> str:
@@ -835,11 +837,11 @@ class StringYamlNode(ScalarYamlNode, BaseYamlNode):
             quoted = _yaml_strconv_quote(self.value)
             return quoted
 
-        lbc = tokens.yaml_detect_line_break_char(self.value)
+        lbc = yaml_detect_line_break_char(self.value)
         if lbc in self.value:
             # This block assumes that the line breaks in this inside scalar content and the Outside scalar content are
             # the same. It works mostly, but inconsistencies occur if line break characters are mixed.
-            header = tokens.yaml_literal_block_header(self.value)
+            header = yaml_literal_block_header(self.value)
             space = ' ' * (self.token.position.column - 1)
             indent = ' ' * self.token.position.indent_num
             values: ta.List[str] = []
@@ -881,7 +883,7 @@ class LiteralYamlNode(ScalarYamlNode, BaseYamlNode):
 
     # read implements(io.Reader).Read
     def read(self, p: str) -> YamlErrorOr[int]:
-        return read_yaml_node(p, self)
+        return yaml_read_node(p, self)
 
     # type returns LiteralType
     def type(self) -> YamlNodeType:
@@ -931,7 +933,7 @@ class MergeKeyYamlNode(ScalarYamlNode, BaseYamlNode):
 
     # read implements(io.Reader).Read
     def read(self, p: str) -> YamlErrorOr[int]:
-        return read_yaml_node(p, self)
+        return yaml_read_node(p, self)
 
     # type returns MergeKeyType
     def type(self) -> YamlNodeType:
@@ -976,7 +978,7 @@ class BoolYamlNode(ScalarYamlNode, BaseYamlNode):
 
     # read implements(io.Reader).Read
     def read(self, p: str) -> YamlErrorOr[int]:
-        return read_yaml_node(p, self)
+        return yaml_read_node(p, self)
 
     # type returns BoolType
     def type(self) -> YamlNodeType:
@@ -997,7 +999,7 @@ class BoolYamlNode(ScalarYamlNode, BaseYamlNode):
     # String boolean to text
     def string(self) -> str:
         if self.comment is not None:
-            return add_yaml_comment_string(self.token.value, self.comment)
+            return yaml_add_comment_string(self.token.value, self.comment)
         return self.string_without_comment()
 
     def string_without_comment(self) -> str:
@@ -1023,7 +1025,7 @@ class InfinityYamlNode(ScalarYamlNode, BaseYamlNode):
 
     # read implements(io.Reader).Read
     def read(self, p: str) -> YamlErrorOr[int]:
-        return read_yaml_node(p, self)
+        return yaml_read_node(p, self)
 
     # type returns InfinityType
     def type(self) -> YamlNodeType:
@@ -1044,7 +1046,7 @@ class InfinityYamlNode(ScalarYamlNode, BaseYamlNode):
     # String infinity to text
     def string(self) -> str:
         if self.comment is not None:
-            return add_yaml_comment_string(self.token.value, self.comment)
+            return yaml_add_comment_string(self.token.value, self.comment)
         return self.string_without_comment()
 
     def string_without_comment(self) -> str:
@@ -1069,7 +1071,7 @@ class NanYamlNode(ScalarYamlNode, BaseYamlNode):
 
     # read implements(io.Reader).Read
     def read(self, p: str) -> YamlErrorOr[int]:
-        return read_yaml_node(p, self)
+        return yaml_read_node(p, self)
 
     # type returns NanType
     def type(self) -> YamlNodeType:
@@ -1090,7 +1092,7 @@ class NanYamlNode(ScalarYamlNode, BaseYamlNode):
     # String returns .nan
     def string(self) -> str:
         if self.comment is not None:
-            return add_yaml_comment_string(self.token.value, self.comment)
+            return yaml_add_comment_string(self.token.value, self.comment)
         return self.string_without_comment()
 
     def string_without_comment(self) -> str:
@@ -1115,7 +1117,7 @@ class MapYamlNode(Abstract):
         raise NotImplementedError
 
 
-START_RANGE_INDEX = -1
+YAML_START_RANGE_INDEX = -1
 
 
 # MapNodeIter is an iterator for ranging over a MapNode
@@ -1184,7 +1186,7 @@ class MappingYamlNode(BaseYamlNode):
 
     # read implements(io.Reader).Read
     def read(self, p: str) -> YamlErrorOr[int]:
-        return read_yaml_node(p, self)
+        return yaml_read_node(p, self)
 
     # type returns MappingType
     def type(self) -> YamlNodeType:
@@ -1207,7 +1209,7 @@ class MappingYamlNode(BaseYamlNode):
             values.append(value.string().lstrip(' '))
         map_text = f'{{{", ".join(values)}}}'
         if comment_mode and self.comment is not None:
-            return add_yaml_comment_string(map_text, self.comment)
+            return yaml_add_comment_string(map_text, self.comment)
         return map_text
 
     def block_style_string(self, comment_mode: bool) -> str:
@@ -1230,7 +1232,7 @@ class MappingYamlNode(BaseYamlNode):
     def string(self) -> str:
         if len(self.values) == 0:
             if self.comment is not None:
-                return add_yaml_comment_string('{}', self.comment)
+                return yaml_add_comment_string('{}', self.comment)
             return '{}'
 
         comment_mode = True
@@ -1242,7 +1244,7 @@ class MappingYamlNode(BaseYamlNode):
     # map_range implements MapNode protocol
     def map_range(self) -> MapYamlNodeIter:
         return MapYamlNodeIter(
-            idx=START_RANGE_INDEX,
+            idx=YAML_START_RANGE_INDEX,
             values=self.values,
         )
 
@@ -1262,7 +1264,7 @@ class MappingKeyYamlNode(MapKeyYamlNode, BaseYamlNode):
 
     # read implements(io.Reader).Read
     def read(self, p: str) -> YamlErrorOr[int]:
-        return read_yaml_node(p, self)
+        return yaml_read_node(p, self)
 
     # type returns MappingKeyType
     def type(self) -> YamlNodeType:
@@ -1321,7 +1323,7 @@ class MappingValueYamlNode(BaseYamlNode):
 
     # read implements(io.Reader).Read
     def read(self, p: str) -> YamlErrorOr[int]:
-        return read_yaml_node(p, self)
+        return yaml_read_node(p, self)
 
     # type returns MappingValueType
     def type(self) -> YamlNodeType:
@@ -1364,7 +1366,7 @@ class MappingValueYamlNode(BaseYamlNode):
 
     def to_string(self) -> str:
         space = ' ' * (check.not_none(self.key.get_token()).position.column - 1)
-        if check_yaml_line_break(check.not_none(self.key.get_token())):
+        if yaml_check_line_break(check.not_none(self.key.get_token())):
             space = f'\n{space}'
 
         key_indent_level = check.not_none(self.key.get_token()).position.indent_level
@@ -1418,7 +1420,7 @@ class MappingValueYamlNode(BaseYamlNode):
     # map_range implements MapNode protocol
     def map_range(self) -> MapYamlNodeIter:
         return MapYamlNodeIter(
-            idx=START_RANGE_INDEX,
+            idx=YAML_START_RANGE_INDEX,
             values=[self],
         )
 
@@ -1507,7 +1509,7 @@ class SequenceYamlNode(BaseYamlNode, ArrayYamlNode):
 
     # read implements(io.Reader).Read
     def read(self, p: str) -> YamlErrorOr[int]:
-        return read_yaml_node(p, self)
+        return yaml_read_node(p, self)
 
     # type returns SequenceType
     def type(self) -> YamlNodeType:
@@ -1531,7 +1533,7 @@ class SequenceYamlNode(BaseYamlNode, ArrayYamlNode):
 
         seq_text = f'[{", ".join(values)}]'
         if self.comment is not None:
-            return add_yaml_comment_string(seq_text, self.comment)
+            return yaml_add_comment_string(seq_text, self.comment)
 
         return seq_text
 
@@ -1597,7 +1599,7 @@ class SequenceYamlNode(BaseYamlNode, ArrayYamlNode):
     # array_range implements ArrayNode protocol
     def array_range(self) -> ta.Optional[ArrayYamlNodeIter]:
         return ArrayYamlNodeIter(
-            idx=START_RANGE_INDEX,
+            idx=YAML_START_RANGE_INDEX,
             values=ta.cast('ta.List[YamlNode]', self.values),
         )
 
@@ -1647,7 +1649,7 @@ class SequenceEntryYamlNode(BaseYamlNode):
         return self.string()
 
     def read(self, p: str) -> YamlErrorOr[int]:
-        return read_yaml_node(p, self)
+        return yaml_read_node(p, self)
 
 
 # sequence_entry creates SequenceEntryNode instance.
@@ -1680,7 +1682,7 @@ class SequenceMergeValueYamlNode(MapYamlNode):
 
     # map_range returns MapNodeIter instance.
     def map_range(self) -> MapYamlNodeIter:
-        ret = MapYamlNodeIter(values=[], idx=START_RANGE_INDEX)
+        ret = MapYamlNodeIter(values=[], idx=YAML_START_RANGE_INDEX)
         for value in self.values:
             it = value.map_range()
             ret.values.extend(it.values)
@@ -1711,7 +1713,7 @@ class AnchorYamlNode(ScalarYamlNode, BaseYamlNode):
 
     # read implements(io.Reader).Read
     def read(self, p: str) -> YamlErrorOr[int]:
-        return read_yaml_node(p, self)
+        return yaml_read_node(p, self)
 
     # type returns AnchorType
     def type(self) -> YamlNodeType:
@@ -1781,7 +1783,7 @@ class AliasYamlNode(ScalarYamlNode, BaseYamlNode):
 
     # read implements(io.Reader).Read
     def read(self, p: str) -> YamlErrorOr[int]:
-        return read_yaml_node(p, self)
+        return yaml_read_node(p, self)
 
     # type returns AliasType
     def type(self) -> YamlNodeType:
@@ -1828,7 +1830,7 @@ class DirectiveYamlNode(BaseYamlNode):
 
     # read implements(io.Reader).Read
     def read(self, p: str) -> YamlErrorOr[int]:
-        return read_yaml_node(p, self)
+        return yaml_read_node(p, self)
 
     # type returns DirectiveType
     def type(self) -> YamlNodeType:
@@ -1877,7 +1879,7 @@ class TagYamlNode(ScalarYamlNode, BaseYamlNode, ArrayYamlNode):
 
     # read implements(io.Reader).Read
     def read(self, p: str) -> YamlErrorOr[int]:
-        return read_yaml_node(p, self)
+        return yaml_read_node(p, self)
 
     # type returns TagType
     def type(self) -> YamlNodeType:
@@ -1933,7 +1935,7 @@ class CommentYamlNode(BaseYamlNode):
 
     # read implements(io.Reader).Read
     def read(self, p: str) -> YamlErrorOr[int]:
-        return read_yaml_node(p, self)
+        return yaml_read_node(p, self)
 
     # type returns CommentType
     def type(self) -> YamlNodeType:
@@ -1966,7 +1968,7 @@ class CommentGroupYamlNode(BaseYamlNode):
 
     # read implements(io.Reader).Read
     def read(self, p: str) -> YamlErrorOr[int]:
-        return read_yaml_node(p, self)
+        return yaml_read_node(p, self)
 
     # type returns CommentType
     def type(self) -> YamlNodeType:
@@ -1995,7 +1997,7 @@ class CommentGroupYamlNode(BaseYamlNode):
         space = ' ' * col
         for comment in self.comments:
             spc = space
-            if check_yaml_line_break(check.not_none(comment.token)):
+            if yaml_check_line_break(check.not_none(comment.token)):
                 spc = f'\n{spc}'
             values.append(spc + comment.string())
         return '\n'.join(values)
@@ -2107,7 +2109,7 @@ class FilterYamlAstWalker(YamlAstVisitor):
 
 
 @dc.dataclass()
-class ParentFinder:
+class YamlParentFinder:
     target: YamlNode
 
     def walk(self, parent: YamlNode, node: ta.Optional[YamlNode]) -> ta.Optional[YamlNode]:
@@ -2169,8 +2171,8 @@ class ParentFinder:
 
 
 # Parent get parent node from child node.
-def parent(root: YamlNode, child: YamlNode) -> ta.Optional[YamlNode]:
-    finder = ParentFinder(target=child)
+def yaml_parent(root: YamlNode, child: YamlNode) -> ta.Optional[YamlNode]:
+    finder = YamlParentFinder(target=child)
     return finder.walk(root, root)
 
 
@@ -2178,14 +2180,14 @@ def parent(root: YamlNode, child: YamlNode) -> ta.Optional[YamlNode]:
 
 
 # Filter returns a list of nodes that match the given type.
-def filter_(typ: YamlNodeType, node: YamlNode) -> ta.List[YamlNode]:
+def yaml_filter(typ: YamlNodeType, node: YamlNode) -> ta.List[YamlNode]:
     walker = FilterYamlAstWalker(typ=typ)
     yaml_ast_walk(walker, node)
     return walker.results
 
 
 # FilterFile returns a list of nodes that match the given type.
-def filter_file(typ: YamlNodeType, file: YamlFile) -> ta.List[YamlNode]:
+def yaml_filter_file(typ: YamlNodeType, file: YamlFile) -> ta.List[YamlNode]:
     results: ta.List[YamlNode] = []
     for doc in file.docs:
         walker = FilterYamlAstWalker(typ=typ)