omlish 0.0.0.dev254__tar.gz → 0.0.0.dev255__tar.gz

{omlish-0.0.0.dev254/omlish.egg-info → omlish-0.0.0.dev255}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: omlish
-Version: 0.0.0.dev254
+Version: 0.0.0.dev255
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev254 → omlish-0.0.0.dev255}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev254'
-__revision__ = '94661b567698b6ba0b73d7f8d8ca9d0cecd3e99a'
+__version__ = '0.0.0.dev255'
+__revision__ = '68bcce87dfef9de1ab636cae14e4cbf5d71889cd'
 
 
 #

{omlish-0.0.0.dev254 → omlish-0.0.0.dev255}/omlish/dispatch/impls.py

@@ -5,7 +5,6 @@ TODO:
  - multidispatch? never solved..
   - just generic on tuple[A0, A1, ...]
 """
-import contextlib
 import typing as ta
 import weakref
 
@@ -24,8 +23,10 @@ _IMPL_FUNC_CLS_SET_CACHE: ta.MutableMapping[ta.Callable, frozenset[type]] = weak
 
 
 def get_impl_func_cls_set(func: ta.Callable) -> frozenset[type]:
-    with contextlib.suppress(KeyError):
+    try:
         return _IMPL_FUNC_CLS_SET_CACHE[func]
+    except KeyError:
+        pass
 
     ann = getattr(func, '__annotations__', {})
     if not ann:

{omlish-0.0.0.dev254 → omlish-0.0.0.dev255}/omlish/os/filemodes.py

@@ -24,7 +24,7 @@ class FileMode:
 
     https://en.cppreference.com/w/cpp/io/c/fopen
 
-    "r"   read             Open a file for reading        read from start   return NULL and set error
+    "r"   read             Open a file for reading       read from start   return NULL and set error
     "w"   write            Create a file for writing     destroy contents  create new
     "a"   append           Append to a file              write to end      create new
     "r+"  read extended    Open a file for read/write    read from start   return NULL and set error

{omlish-0.0.0.dev254 → omlish-0.0.0.dev255}/omlish/sql/parsing/Minisql.g4

@@ -100,11 +100,14 @@ sortItem
     ;
 
 relation
-    : relation AS? ident                                                     #aliasedRelation
-    | left=relation ty=joinType? JOIN right=relation (ON cond=booleanExpr)?  #joinRelation
-    | '(' select ')'                                                         #selectRelation
-    | '(' relation ')'                                                       #parenRelation
-    | qualifiedName                                                          #tableRelation
+    : relation AS? ident      #aliasedRelation
+    | left=relation
+      ty=joinType?
+      JOIN right=relation
+      (ON cond=booleanExpr)?  #joinRelation
+    | '(' select ')'          #selectRelation
+    | '(' relation ')'        #parenRelation
+    | qualifiedName           #tableRelation
     ;
 
 groupBy

{omlish-0.0.0.dev254 → omlish-0.0.0.dev255}/omlish/text/parts.py

@@ -72,40 +72,47 @@ class Meta(DataPart):
 
 
 class PartTransform:
+    def __call__(self, part: Part | None) -> Part:
+        return self._transform(part)
+
     @dispatch.method
-    def __call__(self, part: Part) -> Part:
+    def _transform(self, part: Part | None) -> Part:
         raise TypeError(part)
 
-    @__call__.register
-    def __call__str(self, part: str) -> Part:
+    @_transform.register
+    def _transform_none(self, part: None) -> Part:
+        return []
+
+    @_transform.register
+    def _transform_str(self, part: str) -> Part:
         return part
 
-    @__call__.register
-    def __call__sequence(self, part: collections.abc.Sequence) -> Part:
+    @_transform.register
+    def _transform_sequence(self, part: collections.abc.Sequence) -> Part:
         return [self(c) for c in part]
 
-    @__call__.register
-    def __call__wrap(self, part: Wrap) -> Part:
+    @_transform.register
+    def _transform_wrap(self, part: Wrap) -> Part:
         return Wrap(self(part.part), part.wrapper)
 
-    @__call__.register
-    def __call__list(self, part: List) -> Part:
+    @_transform.register
+    def _transform_list(self, part: List) -> Part:
         return List([self(c) for c in part.parts], part.delimiter, part.trailer)
 
-    @__call__.register
-    def __call__concat(self, part: Concat) -> Part:
+    @_transform.register
+    def _transform_concat(self, part: Concat) -> Part:
         return Concat([self(c) for c in part.parts])
 
-    @__call__.register
-    def __call__block(self, part: Block) -> Part:
+    @_transform.register
+    def _transform_block(self, part: Block) -> Part:
         return Block([self(c) for c in part.parts])
 
-    @__call__.register
-    def __call__section(self, part: Section) -> Part:
+    @_transform.register
+    def _transform_section(self, part: Section) -> Part:
         return Section([self(c) for c in part.parts])
 
-    @__call__.register
-    def __call__meta(self, part: Meta) -> Meta:
+    @_transform.register
+    def _transform_meta(self, part: Meta) -> Meta:
         return part
 
 
@@ -113,8 +120,8 @@ class PartTransform:
 
 
 class RemoveMetas(PartTransform):
-    @PartTransform.__call__.register
-    def __call__meta(self, part: Meta) -> Part:
+    @PartTransform._transform.register  # noqa
+    def _transform_meta(self, part: Meta) -> Part:
         return []
 
 
@@ -137,27 +144,27 @@ def _drop_empties(it: ta.Iterable[T]) -> list[T]:
 
 
 class CompactPart(PartTransform):
-    @PartTransform.__call__.register
-    def __call__sequence(self, part: collections.abc.Sequence) -> Part:
+    @PartTransform._transform.register  # noqa
+    def _transform_sequence(self, part: collections.abc.Sequence) -> Part:
         return _drop_empties(self(c) for c in part)
 
-    @PartTransform.__call__.register
-    def __call__list(self, part: List) -> Part:
+    @PartTransform._transform.register  # noqa
+    def _transform_list(self, part: List) -> Part:
         parts = _drop_empties(self(c) for c in part.parts)
         return List(parts, part.delimiter, part.trailer) if parts else []
 
-    @PartTransform.__call__.register
-    def __call__concat(self, part: Concat) -> Part:
+    @PartTransform._transform.register  # noqa
+    def _transform_concat(self, part: Concat) -> Part:
         parts = _drop_empties(self(c) for c in part.parts)
         return Concat(parts) if parts else []
 
-    @PartTransform.__call__.register
-    def __call__block(self, part: Block) -> Part:
+    @PartTransform._transform.register  # noqa
+    def _transform_block(self, part: Block) -> Part:
         parts = _drop_empties(self(c) for c in part.parts)
         return Block(parts) if parts else []
 
-    @PartTransform.__call__.register
-    def __call__section(self, part: Section) -> Part:
+    @PartTransform._transform.register  # noqa
+    def _transform_section(self, part: Section) -> Part:
         parts = _drop_empties(self(c) for c in part.parts)
         return Section(parts) if parts else []
 
@@ -204,29 +211,36 @@ class PartRenderer:
             self._blank_lines += n
             self._has_indented = False
 
+    def __call__(self, part: Part | None) -> None:
+        return self._render(part)
+
     @dispatch.method
-    def __call__(self, part: Part) -> None:
+    def _render(self, part: Part | None) -> None:
         raise TypeError(part)
 
-    @__call__.register
-    def __call__str(self, part: str) -> None:
+    @_render.register
+    def _render_none(self, part: None) -> None:
+        pass
+
+    @_render.register
+    def _render_str(self, part: str) -> None:
         self._write(part)
 
-    @__call__.register
-    def __call__sequence(self, part: collections.abc.Sequence) -> None:
+    @_render.register
+    def _render_sequence(self, part: collections.abc.Sequence) -> None:
         for i, c in enumerate(part):
             if i:
                 self._write(' ')
             self(c)
 
-    @__call__.register
-    def __call__wrap(self, part: Wrap) -> None:
+    @_render.register
+    def _render_wrap(self, part: Wrap) -> None:
         self._write(part.wrapper[0])
         self(part.part)
         self._write(part.wrapper[1])
 
-    @__call__.register
-    def __call__list(self, part: List) -> None:
+    @_render.register
+    def _render_list(self, part: List) -> None:
         for i, c in enumerate(part.parts):
             if i:
                 self._write(part.delimiter + ' ')
@@ -234,19 +248,19 @@ class PartRenderer:
         if part.trailer:
             self._write(part.delimiter)
 
-    @__call__.register
-    def __call__concat(self, part: Concat) -> None:
+    @_render.register
+    def _render_concat(self, part: Concat) -> None:
         for c in part.parts:
             self(c)
 
-    @__call__.register
-    def __call__block(self, part: Block) -> None:
+    @_render.register
+    def _render_block(self, part: Block) -> None:
         for c in part.parts:
             self(c)
             self._write_newline()
 
-    @__call__.register
-    def __call__section(self, part: Section) -> None:
+    @_render.register
+    def _render_section(self, part: Section) -> None:
         self._indents += 1
         try:
             for c in part.parts:

{omlish-0.0.0.dev254 → omlish-0.0.0.dev255/omlish.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: omlish
-Version: 0.0.0.dev254
+Version: 0.0.0.dev255
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev254 → omlish-0.0.0.dev255}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '>=3.12'
-version = '0.0.0.dev254'
+version = '0.0.0.dev255'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',