1 files changed, 9 insertions, 44 deletions
diff --git a/state.hpp b/state.hpp
index e178877..6311949 100644
--- a/state.hpp
+++ b/state.hpp
@@ -23,7 +23,6 @@
 #include "types.hpp"
 
 #include <cstddef>
-#include <iterator>
 
 constexpr unsigned DataStackSize = 12;
 constexpr unsigned ReturnStackSize = 12;
@@ -43,53 +42,19 @@ public:
 
     constexpr State(Dictionary& d): dict(d) {}
 
-    Cell beyondip() const {
-        return dict.read(ip + 1);
-    }
+    Cell beyondip() const;
 
-    void pushr(Cell value) {
-        if (rsize() == ReturnStackSize)
-            throw;
-        *++rsp = value;
-    }
+    void pushr(Cell);
+    Cell popr();
 
-    Cell popr() {
-        if (rsize() == 0)
-            throw;
-        return *rsp--;
-    }
+    void push(Cell);
+    Cell pop();
 
-    void push(Cell value) {
-        if (size() == DataStackSize)
-            throw;
-        *++dsp = value;
-    }
+    Cell& top();
+    Cell& pick(std::size_t);
 
-    Cell pop() {
-        if (size() == 0)
-            throw;
-        return *dsp--;
-    }
-
-    Cell& top() {
-        if (size() == 0)
-            throw;
-        return *dsp;
-    }
-
-    Cell& pick(std::size_t i) {
-        if (i >= size())
-            throw;
-        return *(dsp - i);
-    }
-
-    std::size_t size() const noexcept {
-        return std::distance(dstack, static_cast<const Cell *>(dsp)) + 1;
-    }
-
-    std::size_t rsize() const noexcept {
-        return std::distance(rstack, static_cast<const Cell *>(rsp)) + 1;
-    }
+    std::size_t size() const noexcept;
+    std::size_t rsize() const noexcept;
 };
 
 #endif // ALEEFORTH_STATE_HPP