From c0f19f767433281363beada1bc7b740a6556b16b Mon Sep 17 00:00:00 2001
From: Jeremy Penner <jeremy@sporktania.com>
Date: Wed, 30 Jan 2019 22:12:28 -0500
Subject: [PATCH] Forp: Refactor interpreter, inline VM loop, implement if/then
 and immediate words

---
 forp.c   | 212 ++++++++++++++++++++++++++++++++++++-------------------
 forp.exe | Bin 34447 -> 35752 bytes
 2 files changed, 141 insertions(+), 71 deletions(-)

diff --git a/forp.c b/forp.c
index 4876719..3be75fe 100755
--- a/forp.c
+++ b/forp.c
@@ -28,6 +28,8 @@ cell *stack = stack_mem;
 
 char *INPUT = NULL;
 
+#define F_IMMEDIATE 0x80
+
 #define CELL_OFFSET(cp, b) ((cell*)(((char *)(cp)) + b))
 #define TOP() (*(stack - 1))
 #define ST1() (*(stack - 2))
@@ -88,7 +90,6 @@ void f_rot() { // a b c -- b c a
   ST2() = b;
 }
 
-
 void f_key() {
   if (INPUT) {
     PUSHI(*INPUT);
@@ -166,23 +167,26 @@ void f_cdef() { // func name --
   DROP(1);
 }
 
-
-int RET = 0;
 void f_docolon() {
-  RPUSH(IP);
-  IP.p = W.p + 1;
+  RPUSH(W);
 
-  while (!RET) {
+  IP.p = W.p + 1;
+  while (rstack != rstack_mem) {
+    cell codeptr;
     W = *IP.p;
     IP.p++;
-    W.p->f();
+    codeptr = *W.p;
+    if (codeptr.f == f_docolon) {
+      RPUSH(IP);
+      IP.p = W.p + 1;
+    } else {
+      codeptr.f();
+    }
   }
-  RET = 0;
-  IP = *RPOP();
 }
 
-void f_ret() {
-  RET = 1;
+
+void f_noop() {
 }
 
 void f_donumber() {
@@ -203,63 +207,100 @@ void f_streq() {
   TOP().i = result == 0;
 }
 
-void f_lookup() { // name -- code pointer
+void f_lookup() { // name -- (codepointer flags) | (name 0)
   cell *entry = LATEST;
   while (entry) {
     f_dup();
     PUSHP(entry + 2);
     f_streq();
     if (TOP().i) {
-      DROP(1);
-      TOP().p = CELL_OFFSET(entry + 2, entry[1].u + 1);
+      unsigned int flags = entry[1].u;
+      TOP().u = flags;
+      ST1().p = CELL_OFFSET(entry + 2, (flags & ~F_IMMEDIATE) + 1);
       return;
     }
     DROP(1);
     entry = entry->p;
   }
-  TOP().p = NULL;
+  PUSHU(0);
 }
 
-void f_def() {
-  cell *herebefore = HERE;
-  cell *latestbefore = LATEST;
+void f_compileon() {
+  STATE.i = 1;
+}
+void f_compileoff() {
+  STATE.i = 0;
+}
+
+void f_immediate() {
+  cell *flags = LATEST + 1;
+  flags->u |= F_IMMEDIATE;
+}
+
+void f_semicolon() {
+  PUSHS("_RET");
+  f_lookup();
+  DROP(1);
+  f_comma();
+  f_compileoff();
+}
+
+void f_ret() {
+  IP = *RPOP();
+}
+
+void f_colon() {
   f_word();
   f_create();
   PUSHP(f_docolon);
   f_comma();
-  while(1) {
-    f_word(); // w
-    f_dup();  // w w
-    f_lookup(); // w code
-    if (TOP().p == NULL) {
-      DROP(1); // w
-      f_dup(); // w w
-      f_number(); // w n isnum
-      if (TOP().i) {
-	PUSHS("_DONUMBER");
-	f_lookup(); // w n isnum _donumber
-	f_comma();
-	PUSHI(ST1().i); // w n isnum n
-	f_comma(); // w n isnum
-	DROP(3);
-      } else {
-	DROP(2); // w
-	HERE = herebefore;
-	LATEST = latestbefore;
-	f_puts();
-	PUSHS("?\n");
-	f_puts();
-	f_cr();
-	return;
-      }
-    } else if (TOP().p->f == f_ret) {
-      f_comma();
-      DROP(1);
-      return;
+  f_compileon();
+}
+
+void f_interpretword() { // codefield flags --
+  if (!STATE.i || (TOP().u & F_IMMEDIATE)) {
+    DROP(1);
+    W = TOP(); // w code
+    DROP(1);
+    W.p->f();
+  } else {
+    DROP(1);
+    f_comma();
+  }
+}
+
+void f_interpretnumber() { // number --
+  if (STATE.i) {
+    PUSHS("_DONUMBER");
+    f_lookup();
+    DROP(1);
+    f_comma();
+    f_comma();
+  }
+}
+
+void f_interpretunknown() { // name --
+  f_puts();
+  PUSHS("?\n");
+  f_puts();
+}
+
+void f_compileword() { // name --
+  f_lookup();
+  if (!TOP().u) { // name 0
+    DROP(1); // name
+    f_dup(); // name name
+    f_number(); // name n isnum
+    if (TOP().i) {
+      f_rot(); // name n isnum -- n isnum name
+      DROP(2); // n isnum w -- n
+      f_interpretnumber();
     } else {
-      f_comma();
-      DROP(1);
+      DROP(2); // name
+      f_interpretunknown();
     }
+  } else { // codepointer flags
+    f_interpretword();
   }
 }
 
@@ -273,26 +314,7 @@ void f_interpret(char *input) {
       DROP(1);
       return;
     }
-    f_dup(); // w w
-    f_lookup(); // w code
-    if (TOP().p == NULL) {
-      DROP(1); // w
-      f_dup(); // w w
-      f_number(); // w n isnum
-      if (TOP().i) {
-	f_rot(); // w n isnum -- n isnum w
-	DROP(2); // n isnum w -- n
-	continue;
-      }
-      DROP(2); // w
-      f_puts();
-      PUSHS("?\n");
-      f_puts();
-      return;
-    }
-    W = TOP(); // w code
-    DROP(2);
-    W.p->f();
+    f_compileword();
     if (stack < stack_mem) {
       stack = stack_mem;
       PUSHS("stack underflow!\n");
@@ -302,6 +324,45 @@ void f_interpret(char *input) {
   }
 }
 
+void f_if() {
+  if (STATE.i) {
+    PUSHC(W);
+    f_comma();
+    PUSHP(HERE);
+    PUSHP(NULL);
+    f_comma();
+  } else {
+    if (TOP().u) {
+      IP.p ++;
+    } else {
+      IP.p = IP.p->p; // skip to then
+    }
+    DROP(1);
+  }
+}
+
+void f_else() {
+  if (STATE.i) {
+
+    PUSHC(W);
+    f_comma();
+
+    TOP().p->p = HERE + 1;
+    TOP().p = HERE;
+
+    PUSHP(NULL);
+    f_comma();
+
+  } else {
+    IP.p = IP.p->p;
+  }
+}
+
+void f_then() {
+  TOP().p->p = HERE;
+  DROP(1);
+}
+
 int DIE = 0;
 void f_quit() {
   DIE = 1;
@@ -309,12 +370,19 @@ void f_quit() {
 
 #define CDEF(name, def) PUSHP(def); PUSHS(name); f_cdef()
 void f_init() {
-  CDEF(":", f_def);
-  CDEF(";", f_ret);
+  CDEF("[", f_compileoff); f_immediate();
+  CDEF("]", f_compileon);
+  CDEF("immediate", f_immediate);
+  CDEF("create", f_create);
+  CDEF(":", f_colon);
+  CDEF(";", f_semicolon); f_immediate();
   CDEF("+", f_add);
   CDEF("-", f_sub);
   CDEF("@", f_get);
   CDEF("!", f_set);
+  CDEF("if", f_if); f_immediate();
+  CDEF("else", f_else); f_immediate();
+  CDEF("then", f_then); f_immediate();
   CDEF("dup", f_dup);
   CDEF("drop", f_drop);
   CDEF("swap", f_drop);
@@ -322,9 +390,11 @@ void f_init() {
   CDEF("emit", f_emit);
   CDEF("number", f_number);
   CDEF("_DONUMBER", f_donumber);
+  CDEF("_RET", f_ret);
   CDEF(".", f_dot);
   CDEF(".s", f_puts);
   CDEF(",", f_comma);
+  CDEF("noop", f_noop);
   CDEF("quit", f_quit);
   f_interpret(": -rot rot rot ;");
 }
diff --git a/forp.exe b/forp.exe
index a57a2e90eb7b6029edaf3d954000f0e5ca447e93..ee516466f09bee1d8c2ebe3da8f1205b47d407ab 100755
GIT binary patch
delta 8289
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

delta 7081
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