From f516ea684aaff7f825b537f488e7bc77774f498e Mon Sep 17 00:00:00 2001
From: Mathias Rav <mathias@scalgo.com>
Date: Fri, 23 Feb 2024 10:55:46 +0100
Subject: [PATCH 1/2] py-lib: Introduce classes TableListIn and
 DirectTableListIn

---
 lib/python/scalgoproto.py | 87 ++++++++++++++++++++++++++++-----------
 1 file changed, 63 insertions(+), 24 deletions(-)

diff --git a/lib/python/scalgoproto.py b/lib/python/scalgoproto.py
index 0b93296..2dada75 100644
--- a/lib/python/scalgoproto.py
+++ b/lib/python/scalgoproto.py
@@ -173,6 +173,67 @@ def _digest(self, h: Hash) -> None:
         h.update(b"\xff\xe4")
 
 
+class TableListIn(ListIn[B]):
+    def __init__(
+        self,
+        reader: "Reader",
+        size: int,
+        offset: int,
+        haser: Callable[["Reader", int, int], bool],
+        t: Type[B],
+    ) -> None:
+        """Private constructor. Use the accessor methods on tables to get an instance"""
+        require_has = False
+        self._table_type = t
+        super().__init__(
+            reader,
+            size,
+            offset,
+            self._table_list_getter,
+            self._table_list_haser,
+            require_has,
+        )
+
+    def _table_list_getter(self, r: "Reader", s: int, i: int) -> B:
+        ooo = unpack48_(r._data[s + 6 * i : s + 6 * i + 6])
+        if ooo == 0:
+            return self._table_type(r, 0, 0)
+        sss = r._read_size(ooo, self._table_type._MAGIC)
+        return self._table_type(r, ooo + 10, sss)
+
+    def _table_list_haser(self, r: "Reader", s: int, i: int) -> bool:
+        return unpack48_(r._data[s + 6 * i : s + 6 * i + 6]) != 0
+
+
+class DirectTableListIn(ListIn[B]):
+    def __init__(
+        self,
+        reader: "Reader",
+        size: int,
+        offset: int,
+        t: Type[B],
+        item_size: int,
+    ) -> None:
+        """Private constructor. Use the accessor methods on tables to get an instance"""
+        require_has = False
+        self._table_type = t
+        self._item_size = item_size
+        super().__init__(
+            reader,
+            size,
+            offset,
+            self._direct_table_list_getter,
+            self._direct_table_list_haser,
+            require_has,
+        )
+
+    def _direct_table_list_getter(self, r: "Reader", s: int, i: int) -> B:
+        return self._table_type(r, s + i * self._item_size, self._item_size)
+
+    def _direct_table_list_haser(self, r: "Reader", s: int, i: int) -> bool:
+        return True
+
+
 class UnionIn(object):
     __slots__ = ["_reader", "_type", "_offset", "_size"]
 
@@ -390,22 +451,7 @@ def _get_table_list(
         self, t: Type[TI], off: int, size: int, direct: bool = False
     ) -> ListIn[TI]:
         if not direct:
-
-            def getter(r: "Reader", s: int, i: int) -> TI:
-                ooo = unpack48_(r._data[s + 6 * i : s + 6 * i + 6])
-                if ooo == 0:
-                    return t(r, 0, 0)
-                sss = r._read_size(ooo, t._MAGIC)
-                return t(r, ooo + 10, sss)
-
-            return ListIn[TI](
-                self,
-                size,
-                off,
-                getter,
-                lambda r, s, i: unpack48_(r._data[s + 6 * i : s + 6 * i + 6]) != 0,
-                False,
-            )
+            return TableListIn[TI](self, size, off, t)
         else:
             magic, item_size = struct.unpack("<II", self._data[off : off + 8])
             if magic != t._MAGIC:
@@ -416,14 +462,7 @@ def getter(r: "Reader", s: int, i: int) -> TI:
             if off + 8 + item_size * size > len(self._data):
                 raise Exception("Invalid table size")
 
-            return ListIn[TI](
-                self,
-                size,
-                off + 8,
-                lambda r, s, i: t(r, s + i * item_size, item_size),
-                lambda r, s, i: True,
-                False,
-            )
+            return DirectTableListIn[TI](self, size, off + 8, t, item_size)
 
     def _get_union_list(self, t: Type[UI], off: int, size: int) -> ListIn[UI]:
         return ListIn[UI](

From 91de67de190a28285ea5606e325c323546e4329e Mon Sep 17 00:00:00 2001
From: Mathias Rav <mathias@scalgo.com>
Date: Fri, 23 Feb 2024 11:04:25 +0100
Subject: [PATCH 2/2] py-lib: Implement ListIn[i:j]

---
 lib/python/scalgoproto.py | 35 +++++++++++++++++++++++++++++++++--
 1 file changed, 33 insertions(+), 2 deletions(-)

diff --git a/lib/python/scalgoproto.py b/lib/python/scalgoproto.py
index 2dada75..2c69b7d 100644
--- a/lib/python/scalgoproto.py
+++ b/lib/python/scalgoproto.py
@@ -4,16 +4,18 @@
 import struct
 from abc import abstractmethod, ABC
 from typing import (
+    Any,
     Callable,
     ClassVar,
     Generic,
+    Optional,
+    Self,
     Sequence,
     Tuple,
     Type,
     TypeVar,
     Union,
-    Optional,
-    Any,
+    overload,
 )
 
 MESSAGE_MAGIC = 0xB5C0C4B3
@@ -119,6 +121,25 @@ def __set__(self, obj: TT, value: B) -> None:
         self.fset(obj, value)
 
 
+class LazySubsequence(Sequence[B]):
+    def __init__(self, xs: Sequence[B], indices: range) -> None:
+        self._xs = xs
+        self._indices = indices
+
+    @overload
+    def __getitem__(self, idx: int) -> B:
+        pass
+
+    @overload
+    def __getitem__(self, idx: slice) -> Self:
+        pass
+
+    def __getitem__(self, idx):
+        if isinstance(idx, slice):
+            return LazySubsequence(self._xs, self._indices[idx])
+        return self._xs[self._indices[idx]]
+
+
 class ListIn(Sequence[B]):
     """Class for reading a list of B"""
 
@@ -146,7 +167,17 @@ def has(self, idx: int) -> bool:
     def __len__(self) -> int:
         return self._size
 
+    @overload
     def __getitem__(self, idx: int) -> B:
+        pass
+
+    @overload
+    def __getitem__(self, idx: slice) -> Sequence[B]:
+        pass
+
+    def __getitem__(self, idx):
+        if isinstance(idx, slice):
+            return LazySubsequence(self, range(*idx.indices(self._size)))
         if idx < 0:
             idx += self._size
         if not 0 <= idx < self._size: