restructured code

Author: gynt

sourcehold/structure_tools/DataProperty.py

@@ -1,3 +1,4 @@
+from typing import cast
 from sourcehold.structure_tools import _resolve_cls_as_type, create_structure_from_buffer
 
 
@@ -107,6 +108,7 @@ def deserialize_from_buffer(self, buf: Buffer, **kwargs):
                     if self.array_size == "*":
                         s = struct.calcsize(self.type)
                         r = []
+                        raise Exception("fixme: do we have break_array?")
                         while not self.break_array(buf):
                             r.append(struct.unpack(self.type, buf.read(s))[0])
                         #return r
@@ -128,17 +130,18 @@ def deserialize_from_buffer(self, buf: Buffer, **kwargs):
                     return r
             elif self.type.__class__ == type:
                 if self.array_size == 0:
-                    r = create_structure_from_buffer(self.type, buf, **kwargs)
+                    r = create_structure_from_buffer(cast(type, self.type), buf, **kwargs)
                     return r
                 else:
                     if self.array_size == "*":
                         s = struct.calcsize(self.type)
                         r = []
+                        raise Exception("fixme: do we have break_array?")
                         while not self.break_array(buf):
                             r.append(create_structure_from_buffer(self.type, buf, **kwargs))
                         return r
                     elif self.array_size.__class__ == int:
-                        r = [create_structure_from_buffer(self.type, buf, **kwargs) for i in range(self.array_size)]
+                        r = [create_structure_from_buffer(cast(type, self.type), buf, **kwargs) for i in range(self.array_size)]
                         return r
                     elif self.array_size.__class__.__name__ == 'function':
                         raise NotImplementedError()

sourcehold/structure_tools/Field.py

@@ -66,7 +66,8 @@ def serialize_to_buffer(self, obj, buf: Buffer):
                 buf.write(r)
             else:
                 if self.array_size == "*":
-                    for o in self.__get__(cast(Iterable, obj)):
+                    obj = cast(Iterable, obj)
+                    for o in self.__get__(obj):
                         buf.write(struct.pack(self.type, o))
                 elif self.array_size.__class__ == int:
                     for o in self.__get__(obj):

sourcehold/structure_tools/Structure.py

@@ -21,7 +21,7 @@ def __init__(self):
     #     self.fields[key].fset(self, value)
 
     @classmethod
-    def get_fields(cls) -> dict:
+    def get_fields(cls) -> dict[str, Field]:
         fields = {}
 
         tree = list(cls.__mro__)