2 files changed, 17 insertions, 9 deletions
diff --git a/libalee/corewords.cpp b/libalee/corewords.cpp
index e323ed9..138ade4 100644
--- a/libalee/corewords.cpp
+++ b/libalee/corewords.cpp
@@ -40,16 +40,17 @@ void find(State& state, Word word)
 void CoreWords::run(Cell ins, State& state)
 {
     DoubleCell dcell;
-    const Addr index = ins;
+    Addr index = ins;
     auto& ip = state.ip();
 
+execute:
     if (index >= Dictionary::Begin) {
         // must be calling a defined subroutine
         state.pushr(ip);
         ip = index;
         return;
     } else if (index >= WordCount) {
-        state.push(index - WordCount);
+        state.push(static_cast<Cell>(index - WordCount));
     } else switch (index) {
     case 0: // _lit
         state.push(state.beyondip());
@@ -148,11 +149,12 @@ void CoreWords::run(Cell ins, State& state)
         find(state, state.dict.input());
         break;
     case 24: // execute
-        ip = state.pop();
-        return;
+        index = state.pop();
+        goto execute;
     case 25: // exit
         ip = state.popr();
-        state.verify(ip != 0, Error::exit);
+        if (ip == 0)
+            state.exit();
         break;
     case 26: // semic
         state.dict.add(findi("exit"));
diff --git a/libalee/state.hpp b/libalee/state.hpp
index 2e69463..abf7a1e 100644
--- a/libalee/state.hpp
+++ b/libalee/state.hpp
@@ -25,6 +25,8 @@
 #include <csetjmp>
 #include <cstddef>
 
+#define verify(C, E)
+
 constexpr unsigned DataStackSize = 64;
 constexpr unsigned ReturnStackSize = 64;
 
@@ -57,6 +59,10 @@ public:
      */
     void reset();
 
+    void exit() {
+        std::longjmp(context.jmpbuf, static_cast<int>(Error::exit));
+    }
+
     Addr& ip() noexcept {
         return context.ip;
     }
@@ -129,10 +135,10 @@ public:
         return dict.read(context.ip);
     }
 
-    inline void verify(bool condition, Error error) {
-        if (!condition)
-            std::longjmp(context.jmpbuf, static_cast<int>(error));
-    }
+//    inline void verify(bool condition, Error error) {
+//        if (!condition)
+//            std::longjmp(context.jmpbuf, static_cast<int>(error));
+//    }
 
 private:
     InputFunc inputfunc; // User-provided function to collect "stdin" input.