1 files changed, 18 insertions, 20 deletions

diff --git a/main.cpp b/main.cpp
index 60653dc..0cc5640 100644
--- a/main.cpp
+++ b/main.cpp
@@ -22,37 +22,35 @@
 #include <span>
 #include <string>
 
-static std::array<sforth::cell, 1024> dict;
-static sforth::forth *fth =
-    [] constexpr {
-        fth = new (dict.data()) sforth::forth;
-        sforth::initialize<&fth>(dict.end());
-        return fth;
-    }();
+constinit static sforth::forth<1024> forth {sforth::initialize<&forth>()};
 
-static bool parse_stream(sforth::forth *, std::istream&, bool say_okay = false);
+constinit static sforth::native_word<".", [](auto) {
+    char buf[32] = {};
+    std::to_chars(buf, buf + sizeof(buf), forth.pop(), forth.base);
+    std::cout << buf << ' ';
+}> dot;
+constinit static sforth::native_word<"emit", [](auto) {
+    std::cout << static_cast<char>(forth.pop());
+}, &dot> emit;
+
+static bool parse_stream(auto&, std::istream&, bool say_okay = false);
 
 int main(int argc, const char *argv[])
 {
     std::span args (argv + 1, argc - 1);
 
-    fth->add(".", [](auto) {
-        char buf[32] = {};
-        std::to_chars(buf, buf + sizeof(buf), fth->pop(), fth->base);
-        std::cout << buf << ' ';
-    });
-    fth->add("emit", [](auto) { std::cout << static_cast<char>(fth->pop()); });
-    fth->add("dictsize", [](auto) { fth->push(dict.size() * sizeof(sforth::cell)); });
+
+    dot.next = std::exchange(forth.next, &emit);
 
     for (auto arg : args) {
-        if (std::ifstream file {arg}; parse_stream(fth, file))
+        if (std::ifstream file {arg}; parse_stream(forth, file))
             return 0;
     }
 
-    parse_stream(fth, std::cin, true);
+    parse_stream(forth, std::cin, true);
 }
 
-bool parse_stream(sforth::forth *fth, std::istream& str, bool say_okay)
+bool parse_stream(auto &fth, std::istream& str, bool say_okay)
 {
     std::string line;
 
@@ -63,7 +61,7 @@ bool parse_stream(sforth::forth *fth, std::istream& str, bool say_okay)
                 return true;
 
             try {
-                fth->parse_line(line);
+                fth.parse_line(line);
             } catch (sforth::error e) {
                 std::cerr << sforth::error_string(e) << " in " << line << std::endl;
                 continue;
@@ -71,7 +69,7 @@ bool parse_stream(sforth::forth *fth, std::istream& str, bool say_okay)
         }
 
         if (say_okay)
-            std::cout << (fth->compiling ? "compiled" : "ok") << std::endl;
+            std::cout << (fth.compiling ? "compiled" : "ok") << std::endl;
     }
 
     return false;