fundamental compiling words

1 files changed, 21 insertions, 14 deletions

diff --git a/corewords.hpp b/corewords.hpp
index babb5aa..76c1353 100644
--- a/corewords.hpp
+++ b/corewords.hpp
@@ -22,32 +22,37 @@
 #include "types.hpp"
 #include "state.hpp"
 
+#include <string_view>
+
 void user_sys(State&);
 
 class CoreWords
 {
 public:
-    constexpr static std::size_t VisibleWordCount = 33;             // size
-    constexpr static auto HiddenWordLiteral = VisibleWordCount;     // index
-    constexpr static auto HiddenWordJump    = VisibleWordCount + 1; // index
-    constexpr static auto WordCount         = HiddenWordJump + 1;   // size
+    constexpr static std::size_t VisibleWordCount = 38;             // size
+    constexpr static auto HiddenWordJump    = VisibleWordCount;     // index
+    constexpr static auto WordCount         = VisibleWordCount + 1; // size
 
-    constexpr static Cell Immediate     = (1 << 5);
-    constexpr static Cell CoreImmediate = (1 << 6);
+    constexpr static Cell Immediate   = (1 << 5);
+    constexpr static Cell Compiletime = (1 << 6);
 
+    static int findi(std::string_view);
     static int findi(State&, Word);
     static Func find(State&, Word);
     static void run(int, State&);
 
 private:
+    // Ends with '\0': regular word
+    // Ends with '\1': compile-only word
     constexpr static char wordsarr[] =
         "drop\0dup\0swap\0pick\0sys\0"
         "+\0-\0*\0/\0%\0"
         "_@\0_!\0rot\0>r\0r>\0"
         "=\0<\0allot\0&\0|\0"
         "^\0<<\0>>\0(\0:\1"
-        ";\1here\0imm\0const\0"
-        "if\1then\1else\1depth\0";
+        ";\1here\0imm\0const\0depth\0"
+        "key\0exit\0'\0execute\0_jmp\0"
+        "_jmp0\0_lit\0literal\1";
 
     static Func get(int);
 
@@ -63,7 +68,7 @@ private:
     static void op_mod(State&);
     static void op_peek(State&);
     static void op_poke(State&);
-    static void op_rot(State&);
+    static void op_rot(State&);   // : rot >r swap r> swap ;
     static void op_pushr(State&);
     static void op_popr(State&);
     static void op_eq(State&);
@@ -80,14 +85,16 @@ private:
     static void op_here(State&);
     static void op_imm(State&);
     static void op_const(State&);
-    static void op_literal(State&);
+    static void op_lit(State&);
     static void op_jump(State&);
-    static void op_if(State&);
-    static void op_then(State&);
-    static void op_else(State&);
     static void op_depth(State&);
     static void op_key(State&);
-    static void op_word(State&);
+    static void op_exit(State&);
+    static void op_tick(State&);
+    static void op_execute(State&);
+    static void op_jmp(State&);
+    static void op_jmp0(State&);
+    static void op_literal(State&); // : literal ['] _lit , , ; imm
 };
 
 #endif // ALEEFORTH_COREWORDS_HPP