1 files changed, 26 insertions, 4 deletions
diff --git a/libalee/types.hpp b/libalee/types.hpp
index 530ff4f..5b577f2 100644
--- a/libalee/types.hpp
+++ b/libalee/types.hpp
@@ -20,7 +20,9 @@
 #define ALEEFORTH_TYPES_HPP
 
 #include <cstdint>
+#include <iterator>
 
+struct Dictionary;
 struct State;
 
 using Addr = uint16_t;
@@ -32,12 +34,32 @@ constexpr unsigned int MaxCellNumberChars = 6; // -32768
 
 struct Word
 {
+    struct iterator;
+
     Addr start = 0;
-    Addr end = 0;
+    Addr wend = 0;
+
+    iterator begin(const Dictionary *);
+    iterator end(const Dictionary *);
+    unsigned size() const noexcept;
+
+    struct iterator {
+        using iterator_category = std::input_iterator_tag;
+        using value_type = uint8_t;
+        using pointer = void;
+        using reference = void;
+        using difference_type = Cell;
+
+        Addr addr;
+        const Dictionary *dict;
+
+        constexpr iterator(Addr a, const Dictionary *d):
+            addr(a), dict(d) {}
 
-    unsigned size() const noexcept {
-        return end - start;
-    }
+        iterator& operator++();
+        value_type operator*();
+        bool operator!=(const iterator&);
+    };
 };
 
 #endif // ALEEFORTH_TYPES_HPP