omlish 0.0.0.dev274__py3-none-any.whl → 0.0.0.dev275__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev274'
-__revision__ = '198dbdd7a7fd13d7d9a6f0f3642a26adc79535ff'
+__version__ = '0.0.0.dev275'
+__revision__ = 'fd5c964d07819bc7ca6e9da1e21d2032d1e2665c'
 
 
 #

omlish/typedvalues/collection.py

@@ -29,8 +29,10 @@ class TypedValues(
     ta.Generic[TypedValueT],
 ):
     def __init__(self, *tvs: TypedValueT, override: bool = False) -> None:
-        if hasattr(self, '_lst'):
+        if hasattr(self, '_tup'):
             # When __new__ returns the empty singleton __init__ will still be called.
+            if self is not self._EMPTY:
+                raise RuntimeError
             return
 
         super().__init__()
@@ -69,10 +71,11 @@ class TypedValues(
                 lst.append(tv)
                 dct.setdefault(type(tv), []).append(tv)
 
-        self._lst = lst
-        self._dct = dct
-
-        self._any_dct: dict[type, ta.Sequence[ta.Any]] = {}
+        self._tup: tuple[TypedValueT, ...] = tuple(lst)
+        self._dct: dict[type[TypedValueT], TypedValueT | tuple[TypedValueT, ...]] = {
+            k: tuple(v) if isinstance(v, list) else v
+            for k, v in dct.items()
+        }
 
     #
 
@@ -92,30 +95,69 @@ class TypedValues(
 
     #
 
-    def with_(self, *tvs, override: bool = False) -> 'TypedValues':
-        return TypedValues(*self._lst, *tvs, override=override)
-
     def without(self, *tys: type) -> ta.Iterator[TypedValueT]:
-        for o in self._lst:
+        for o in self._tup:
             if isinstance(o, tys):
                 continue
             yield o
 
     #
 
+    def update(self, *tvs, override: bool = False) -> 'TypedValues':
+        return TypedValues(*self._tup, *tvs, override=override)
+
+    def discard(self, *tys: type) -> 'TypedValues':
+        return TypedValues(*self.without(*tys))
+
+    #
+
     def __repr__(self) -> str:
-        return f'{self.__class__.__name__}({", ".join(map(repr, self._lst))})'
+        return f'{self.__class__.__name__}({", ".join(map(repr, self._tup))})'
+
+    #
+
+    _set: frozenset[TypedValueT]
+
+    def to_set(self) -> frozenset[TypedValueT]:
+        try:
+            return self._set
+        except AttributeError:
+            pass
+        s = frozenset(self._tup)
+        self._set = s
+        return s
+
+    #
+
+    _hash: int
+
+    def __hash__(self) -> int:
+        try:
+            return self._hash
+        except AttributeError:
+            pass
+        h = hash(self._tup)
+        self._hash = h
+        return h
+
+    def __eq__(self, other):
+        if not isinstance(other, type(self)):
+            return NotImplemented
+        return (
+            other is self or
+            other._tup == self._tup
+        )
 
     #
 
     def __iter__(self) -> ta.Iterator[TypedValueT]:
-        return iter(self._lst)
+        return iter(self._tup)
 
     def __len__(self) -> int:
-        return len(self._lst)
+        return len(self._tup)
 
     def __bool__(self) -> bool:
-        return bool(self._lst)
+        return bool(self._tup)
 
     #
 
@@ -124,7 +166,7 @@ class TypedValues(
 
     def _typed_value_getitem(self, key):
         if isinstance(key, int):
-            return self._lst[key]
+            return self._tup[key]
         elif isinstance(key, type):
             return self._dct[check.issubclass(key, TypedValue)]
         else:
@@ -138,17 +180,24 @@ class TypedValues(
             if issubclass(key, UniqueTypedValue):
                 return default
             elif default is not None:
-                return list(default)
+                return tuple(default)
             else:
-                return []
+                return ()
+
+    _any_dct: dict[type, tuple[TypedValueT, ...]]
 
     def _typed_value_get_any(self, cls):
         try:
-            return self._any_dct[cls]
+            any_dct = self._any_dct
+        except AttributeError:
+            any_dct = {}
+            self._any_dct = any_dct
+        try:
+            return any_dct[cls]
         except KeyError:
             pass
-        ret = [tv for tv in self if isinstance(tv, cls)]
-        self._any_dct[cls] = ret
+        ret = tuple(tv for tv in self if isinstance(tv, cls))
+        any_dct[cls] = ret
         return ret
 
 

{omlish-0.0.0.dev274.dist-info → omlish-0.0.0.dev275.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev274
+Version: 0.0.0.dev275
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev274.dist-info → omlish-0.0.0.dev275.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=pjGUyLHaoWpPqRP3jz2u1fC1qoRc2lvrEcpU_Ax2tdg,8253
-omlish/__about__.py,sha256=uaTsfptyouZtf01Rjtt8vRjFEZA-hjAx0C1JaK4Uxns,3380
+omlish/__about__.py,sha256=lF4UMo4JKgTQYbwgQIGekUW4rRztnuwQfTy1Wa-z9kQ,3380
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
 omlish/c3.py,sha256=rer-TPOFDU6fYq_AWio_AmA-ckZ8JDY5shIzQ_yXfzA,8414
 omlish/cached.py,sha256=MLap_p0rdGoDIMVhXVHm1tsbcWobJF0OanoodV03Ju8,542
@@ -778,14 +778,14 @@ omlish/text/go/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/text/go/quoting.py,sha256=N9EYdnFdEX_A8fOviH-1w4jwV3XOQ7VU2WsoUNubYVY,9137
 omlish/typedvalues/__init__.py,sha256=YalNleXS2vQX_3dOIMwfb4n_uBkENTT4QXHnsHatGGM,496
 omlish/typedvalues/accessor.py,sha256=0k21N-CkjGaY6zCwugsRfOC_CDkqk7wNz4oxO1_6EEA,2919
-omlish/typedvalues/collection.py,sha256=lv0xO_ZDApg0v5FZCdeVDBiUf60YEaXRBDbRrjBwZSY,4129
+omlish/typedvalues/collection.py,sha256=jsXSggmMMvGATcJgQkUXt5Guwq8aquw73_OIC-e6U0I,5300
 omlish/typedvalues/generic.py,sha256=byWG_gMXhNelckUwdmOoJE9FKkL71Q4BSi4ZLyy0XZ0,788
 omlish/typedvalues/holder.py,sha256=4SwRezsmuDDEO5gENGx8kTm30pblF5UktoEAu02i-Gk,1554
 omlish/typedvalues/marshal.py,sha256=BuFQMoaLSDbEm32nj_hkBSClPvC0euNFU7_EhsrfBck,4487
 omlish/typedvalues/values.py,sha256=Acyf6xSdNHxrkRXLXrFqJouk35YOveso1VqTbyPwQW4,1223
-omlish-0.0.0.dev274.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev274.dist-info/METADATA,sha256=IDyj3CVbK6H5psd69W58F70u__Va0Ix6doHB68Ja_q4,4198
-omlish-0.0.0.dev274.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-omlish-0.0.0.dev274.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev274.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev274.dist-info/RECORD,,
+omlish-0.0.0.dev275.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev275.dist-info/METADATA,sha256=UZAxSmm4fOzFFAc7qszP_AvnFcJB1Sp3UwcpxUQ9V6w,4198
+omlish-0.0.0.dev275.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+omlish-0.0.0.dev275.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev275.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev275.dist-info/RECORD,,