From c1693c6256898ba4558fa3dc018f9bc558cccd7d Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Sat, 28 Mar 2020 13:02:04 -0400
Subject: [PATCH] forth: Forth-ify "TOWORD"

---
 emul/forth/z80c.bin | Bin 1002 -> 1037 bytes
 forth/forth.asm     |  19 ++-----------------
 forth/icore.fs      |   8 +++++++-
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/emul/forth/z80c.bin b/emul/forth/z80c.bin
index 5f84a62194e63058f255050c9442634504db9fc5..a0a132363819b9e457ff8195cfa14b4cd6d54cf2 100644
GIT binary patch
delta 114
zcmaFG-pjE;oQbthn4PD8vJBI7qY(da{~#AR1~xv1nJnRKt62`SOlPWRVqtJ(vSh1g
zdh_3r38H|7k3oTf?}ZN6<U>sEjJ}h(m~DZi2eXgx4K7C}D|v=SK89&rKqU+u%)XPC
NGpjPzOg_sj3jkwA8-M@+

delta 79
zcmeC>c*VX!oQXAC_z8E;WErOE{NesVE;0-(d<+T<d@t^?On%Db&Zsq6m)RCbW;6Q;
hZ{>1ivXW<L<YOr20xDtPVAh&^idmI0a`FdeSpY#@6RH3J

diff --git a/forth/forth.asm b/forth/forth.asm
index 2e480e2..d0140c7 100644
--- a/forth/forth.asm
+++ b/forth/forth.asm
@@ -875,26 +875,11 @@ NOT:
 	push	hl
 	jp	next
 
-; ( -- c )
-; C< DUP 32 CMP 1 - SKIP? EXIT DROP TOWORD
-	.db	"TOWORD"
-	.dw	$-NOT
-	.db	6
-TOWORD:
-	.dw	compiledWord
-	.dw	CIN
-	.dw	DUP
-	.dw	ISWS
-	.dw	CSKIP
-	.dw	EXIT
-	.dw	DROP
-	.dw	TOWORD
-	.dw	EXIT
 
-.fill 73
+.fill 100
 
 	.db	"(parsed)"
-	.dw	$-TOWORD
+	.dw	$-NOT
 	.db	8
 PARSED:
 	.dw	nativeWord
diff --git a/forth/icore.fs b/forth/icore.fs
index a7b52da..e0067bd 100644
--- a/forth/icore.fs
+++ b/forth/icore.fs
@@ -78,12 +78,18 @@
     HERE @ 1 + HERE !
 ;
 
+: TOWORD
+    BEGIN
+    C< DUP WS? NOT IF EXIT THEN DROP
+    AGAIN
+;
+
 ( Read word from C<, copy to WORDBUF, null-terminate, and
   return, make HL point to WORDBUF. )
 : WORD
     ( JTBL+30 == WORDBUF )
     [ JTBL 30 + @ LITN ]        ( a )
-    TOWORD                      ( a c )
+    _c TOWORD                   ( a c )
     BEGIN
         ( We take advantage of the fact that char MSB is
           always zero to pre-write our null-termination )