Moving operator overrides into a Numeric class and using this for both Constant and Enum

packtype/enum.py

@@ -17,6 +17,7 @@
 from typing import Any
 
 from .base import Base
+from .numeric import Numeric
 
 
 class EnumMode(enum.Enum):
@@ -29,7 +30,7 @@ class EnumError(Exception):
     pass
 
 
-class Enum(Base):
+class Enum(Base, Numeric):
     _PT_ATTRIBUTES: dict[str, tuple[Any, list[Any]]] = {
         "mode": (EnumMode.INDEXED, list(EnumMode)),
         "width": (-1, lambda x: int(x) > 0),

packtype/numeric.py

@@ -0,0 +1,194 @@
+# Copyright 2023, Peter Birch, mailto:peter@intuity.io
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Copyright 2023, Peter Birch, mailto:peter@intuity.io
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+try:
+    from typing import Self
+except ImportError:
+    from typing_extensions import Self  # noqa: UP035
+
+from .base import MetaBase
+
+
+class Numeric:
+
+    def __int__(self) -> int:
+        raise NotImplementedError("Subclass must implement __int__")
+
+    # ==========================================================================
+    # Operator overrides
+    # ==========================================================================
+
+    def __add__(self, other: int | Self) -> int:
+        return int(self) + int(other)
+
+    def __sub__(self, other: int | Self) -> int:
+        return int(self) - int(other)
+
+    def __mul__(self, other: int | Self) -> int:
+        if isinstance(other, MetaBase):
+            return int(self) * other
+        else:
+            return int(self) * int(other)
+
+    def __truediv__(self, other: int | Self) -> int:
+        return int(self) / int(other)
+
+    def __floordiv__(self, other: int | Self) -> int:
+        return int(self) // int(other)
+
+    def __mod__(self, other: int | Self) -> int:
+        return int(self) % int(other)
+
+    def __divmod__(self, other: int | Self) -> int:
+        return (int(self) // int(other), int(self) % int(other))
+
+    def __pow__(self, other: int | Self) -> int:
+        return int(self) ** int(other)
+
+    def __lshift__(self, other: int | Self) -> int:
+        return int(self) << int(other)
+
+    def __rshift__(self, other: int | Self) -> int:
+        return int(self) >> int(other)
+
+    def __and__(self, other: int | Self) -> int:
+        return int(self) & int(other)
+
+    def __xor__(self, other: int | Self) -> int:
+        return int(self) ^ int(other)
+
+    def __or__(self, other: int | Self) -> int:
+        return int(self) | int(other)
+
+    def __radd__(self, other: int | Self) -> int:
+        return int(other) + int(self)
+
+    def __rsub__(self, other: int | Self) -> int:
+        return int(other) - int(self)
+
+    def __rmul__(self, other: int | Self) -> int:
+        return int(other) * int(self)
+
+    def __rtruediv__(self, other: int | Self) -> int:
+        return int(other) / int(self)
+
+    def __rfloordiv__(self, other: int | Self) -> int:
+        return int(other) // int(self)
+
+    def __rmod__(self, other: int | Self) -> int:
+        return int(other) % int(self)
+
+    def __rdivmod__(self, other: int | Self) -> int:
+        return (int(other) // int(self), int(other) % int(self))
+
+    def __rpow__(self, other: int | Self) -> int:
+        return int(other) ** int(self)
+
+    def __rlshift__(self, other: int | Self) -> int:
+        return int(other) << int(self)
+
+    def __rrshift__(self, other: int | Self) -> int:
+        return int(other) >> int(self)
+
+    def __rand__(self, other: int | Self) -> int:
+        return int(other) & int(self)
+
+    def __rxor__(self, other: int | Self) -> int:
+        return int(other) ^ int(self)
+
+    def __ror__(self, other: int | Self) -> int:
+        return int(other) | int(self)
+
+    def __iadd__(self, other: int | Self) -> int:
+        return int(self) + int(other)
+
+    def __isub__(self, other: int | Self) -> int:
+        return int(self) - int(other)
+
+    def __imul__(self, other: int | Self) -> int:
+        return int(self) * int(other)
+
+    def __itruediv__(self, other: int | Self) -> int:
+        return int(self) / int(other)
+
+    def __ifloordiv__(self, other: int | Self) -> int:
+        return int(self) // int(other)
+
+    def __imod__(self, other: int | Self) -> int:
+        return int(self) % int(other)
+
+    def __ipow__(self, other: int | Self) -> int:
+        return int(self) ** int(other)
+
+    def __ilshift__(self, other: int | Self) -> int:
+        return int(self) << int(other)
+
+    def __irshift__(self, other: int | Self) -> int:
+        return int(self) >> int(other)
+
+    def __iand__(self, other: int | Self) -> int:
+        return int(self) & int(other)
+
+    def __ixor__(self, other: int | Self) -> int:
+        return int(self) ^ int(other)
+
+    def __ior__(self, other: int | Self) -> int:
+        return int(self) | int(other)
+
+    def __neg__(self) -> int:
+        return -1 * int(self)
+
+    def __pos__(self) -> int:
+        return abs(int(self))
+
+    def __abs__(self) -> int:
+        return abs(int(self))
+
+    def __invert__(self) -> int:
+        return ~int(self)
+
+    def __lt__(self, other: int | Self) -> bool:
+        return int(self) < int(other)
+
+    def __le__(self, other: int | Self) -> bool:
+        return int(self) <= int(other)
+
+    def __eq__(self, other: int | Self) -> bool:
+        return int(self) == int(other)
+
+    def __ne__(self, other: int | Self) -> bool:
+        return int(self) != int(other)
+
+    def __gt__(self, other: int | Self) -> bool:
+        return int(self) > int(other)
+
+    def __ge__(self, other: int | Self) -> bool:
+        return int(self) >= int(other)
+
+    def __hash__(self) -> int:
+        return id(self)

packtype/primitive.py

@@ -20,6 +20,7 @@
     from typing_extensions import Self  # noqa: UP035
 
 from .base import Base, MetaBase
+from .numeric import Numeric
 
 
 class PrimitiveValueError(Exception):
@@ -51,7 +52,7 @@ def get_variant(prim: Self, width: int, signed: bool):
         )
 
 
-class Primitive(Base, metaclass=MetaPrimitive):
+class Primitive(Base, Numeric, metaclass=MetaPrimitive):
     _PT_WIDTH: int = -1
     _PT_SIGNED: bool = False
 
@@ -94,157 +95,3 @@ def _pt_set(self, value: int, force: bool = False) -> int:
 
     def __int__(self) -> int:
         return self.__value
-
-    # ==========================================================================
-    # Operator overrides
-    # ==========================================================================
-
-    def __add__(self, other: int | Self) -> int:
-        return int(self) + int(other)
-
-    def __sub__(self, other: int | Self) -> int:
-        return int(self) - int(other)
-
-    def __mul__(self, other: int | Self) -> int:
-        if isinstance(other, MetaBase):
-            return int(self) * other
-        else:
-            return int(self) * int(other)
-
-    def __truediv__(self, other: int | Self) -> int:
-        return int(self) / int(other)
-
-    def __floordiv__(self, other: int | Self) -> int:
-        return int(self) // int(other)
-
-    def __mod__(self, other: int | Self) -> int:
-        return int(self) % int(other)
-
-    def __divmod__(self, other: int | Self) -> int:
-        return (int(self) // int(other), int(self) % int(other))
-
-    def __pow__(self, other: int | Self) -> int:
-        return int(self) ** int(other)
-
-    def __lshift__(self, other: int | Self) -> int:
-        return int(self) << int(other)
-
-    def __rshift__(self, other: int | Self) -> int:
-        return int(self) >> int(other)
-
-    def __and__(self, other: int | Self) -> int:
-        return int(self) & int(other)
-
-    def __xor__(self, other: int | Self) -> int:
-        return int(self) ^ int(other)
-
-    def __or__(self, other: int | Self) -> int:
-        return int(self) | int(other)
-
-    def __radd__(self, other: int | Self) -> int:
-        return int(other) + int(self)
-
-    def __rsub__(self, other: int | Self) -> int:
-        return int(other) - int(self)
-
-    def __rmul__(self, other: int | Self) -> int:
-        return int(other) * int(self)
-
-    def __rtruediv__(self, other: int | Self) -> int:
-        return int(other) / int(self)
-
-    def __rfloordiv__(self, other: int | Self) -> int:
-        return int(other) // int(self)
-
-    def __rmod__(self, other: int | Self) -> int:
-        return int(other) % int(self)
-
-    def __rdivmod__(self, other: int | Self) -> int:
-        return (int(other) // int(self), int(other) % int(self))
-
-    def __rpow__(self, other: int | Self) -> int:
-        return int(other) ** int(self)
-
-    def __rlshift__(self, other: int | Self) -> int:
-        return int(other) << int(self)
-
-    def __rrshift__(self, other: int | Self) -> int:
-        return int(other) >> int(self)
-
-    def __rand__(self, other: int | Self) -> int:
-        return int(other) & int(self)
-
-    def __rxor__(self, other: int | Self) -> int:
-        return int(other) ^ int(self)
-
-    def __ror__(self, other: int | Self) -> int:
-        return int(other) | int(self)
-
-    def __iadd__(self, other: int | Self) -> int:
-        return int(self) + int(other)
-
-    def __isub__(self, other: int | Self) -> int:
-        return int(self) - int(other)
-
-    def __imul__(self, other: int | Self) -> int:
-        return int(self) * int(other)
-
-    def __itruediv__(self, other: int | Self) -> int:
-        return int(self) / int(other)
-
-    def __ifloordiv__(self, other: int | Self) -> int:
-        return int(self) // int(other)
-
-    def __imod__(self, other: int | Self) -> int:
-        return int(self) % int(other)
-
-    def __ipow__(self, other: int | Self) -> int:
-        return int(self) ** int(other)
-
-    def __ilshift__(self, other: int | Self) -> int:
-        return int(self) << int(other)
-
-    def __irshift__(self, other: int | Self) -> int:
-        return int(self) >> int(other)
-
-    def __iand__(self, other: int | Self) -> int:
-        return int(self) & int(other)
-
-    def __ixor__(self, other: int | Self) -> int:
-        return int(self) ^ int(other)
-
-    def __ior__(self, other: int | Self) -> int:
-        return int(self) | int(other)
-
-    def __neg__(self) -> int:
-        return -1 * int(self)
-
-    def __pos__(self) -> int:
-        return abs(int(self))
-
-    def __abs__(self) -> int:
-        return abs(int(self))
-
-    def __invert__(self) -> int:
-        return ~int(self)
-
-    def __lt__(self, other: int | Self) -> bool:
-        return int(self) < int(other)
-
-    def __le__(self, other: int | Self) -> bool:
-        return int(self) <= int(other)
-
-    def __eq__(self, other: int | Self) -> bool:
-        return int(self) == int(other)
-
-    def __ne__(self, other: int | Self) -> bool:
-        return int(self) != int(other)
-
-    def __gt__(self, other: int | Self) -> bool:
-        return int(self) > int(other)
-
-    def __ge__(self, other: int | Self) -> bool:
-        return int(self) >= int(other)
-
-    def __hash__(self) -> int:
-        return id(self)