-Wconversion

1 files changed, 10 insertions, 4 deletions

diff --git a/libalee/types.hpp b/libalee/types.hpp
index f23f92e..95daee6 100644
--- a/libalee/types.hpp
+++ b/libalee/types.hpp
@@ -52,14 +52,20 @@ enum class Error : int {
  */
 struct Word
 {
-    struct iterator;
+    Addr start;
+    Addr wend;
+
+    constexpr explicit Word(Addr s = 0, Addr e = 0):
+        start(s), wend(e) {}
 
-    Addr start = 0;
-    Addr wend = 0;
+    static constexpr Word fromLength(Addr s, Addr l) {
+        return Word(s, s + l);
+    }
 
-    unsigned size() const noexcept;
+    Addr size() const noexcept;
 
     // Iterators provided for std::equal.
+    struct iterator;
     iterator begin(const Dictionary *);
     iterator end(const Dictionary *);