1 files changed, 23 insertions, 10 deletions
diff --git a/libs/kstd/gdb/vector.py b/libs/kstd/gdb/vector.py
index 69f8ca2..f11e064 100644
--- a/libs/kstd/gdb/vector.py
+++ b/libs/kstd/gdb/vector.py
@@ -2,24 +2,37 @@ import gdb
 
 
 class KstdVectorPrinter(gdb.ValuePrinter):
-    def __init__(self, val):
+    class Iterator:
+        def __init__(self, begin: gdb.Value, end: gdb.Value):
+            self._item = begin
+            self._end = end
+            self._count = 0
+
+        def __iter__(self):
+            return self
+
+        def __next__(self):
+            count = self._count
+            self._count = count + 1
+
+            if self._item == self._end:
+                raise StopIteration
+
+            element = self._item.dereference()
+            self._item = self._item + 1
+            return (f"[{count}]", element)
+
+    def __init__(self, val: gdb.Value):
         self.__val = val
         self.__size = int(val["m_size"])
         self.__capacity = int(val["m_capacity"])
+        self.__data = val["m_data"]
 
     def to_string(self):
         return f"vector of length {self.__size}, capacity {self.__capacity}"
 
     def children(self):
-        data_pointer = self.__val["m_data"]
-        for i in range(self.__size):
-            yield (f"[{i}]", (data_pointer + i).dereference())
-
-    def child(self, n):
-        if n < self.__size:
-            return (f"[{n}]", (self.__val["m_data"] + n).dereference())
-        else:
-            raise gdb.MemoryError("Index out of range")
+        return self.Iterator(self.__data, self.__data + self.__size)
 
     def display_hint(self):
         return "array"