From 9fcfebd84c883d7b61944c2aaf8a2388200ec383 Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Sat, 28 Mar 2020 13:18:43 -0400
Subject: [PATCH] forth: Forth-ify "WS?"

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

diff --git a/emul/forth/z80c.bin b/emul/forth/z80c.bin
index 0e6fbf1d9b9e4f027442ef0b294bdb41c5e377f7..6c75407551dc9c9d0f53d2d34f40eb141075e192 100644
GIT binary patch
delta 155
zcmeC>Sjw?MoQZXr@LX=y$udmSqr!vjr5Tv{7!(*38LqM^FfcOAWIN2_$Q0rq?jPhL
z!NA7HFq0*mZ8_&*mg!9OOe_qJOqOi*OmF@>GJzDxF|dI2^1V33naL&q)eq4y`74t-
u<KxM?%(g%>o7qP=kIRwCN}i#Sk3okEsD*)p`SIja%&JU6T$4XC%K!lPiX>kE

delta 105
zcmZ3=(aW(xoQYLHgq^2<vJBI7!4Us&{~#AR1~xv1nJnRKt63)BVUibG#hJ+_z^1^!
z$S{))D$L7l&UkvVE3++-Y-aWm4&!oUvXW<L<YN%wQefa?;9x#I`4O`!(=X1+oGdZ`
D5Iq<=

diff --git a/forth/forth.asm b/forth/forth.asm
index 26ffeba..4feaf28 100644
--- a/forth/forth.asm
+++ b/forth/forth.asm
@@ -830,27 +830,10 @@ CIN:
 	.dw	EXIT
 
 
-; ( c -- f )
-; 33 CMP 1 + NOT
-; The NOT is to normalize the negative/positive numbers to 1 or 0.
-; Hadn't we wanted to normalize, we'd have written:
-; 32 CMP 1 -
-	.db	"WS?"
-	.dw	$-CIN
-	.db	3
-ISWS:
-	.dw	compiledWord
-	.dw	NUMBER
-	.dw	33
-	.dw	CMP
-	.dw	NUMBER
-	.dw	1
-	.dw	PLUS
-	.dw	NOT
-	.dw	EXIT
+.fill 24
 
 	.db	"NOT"
-	.dw	$-ISWS
+	.dw	$-CIN
 	.db	3
 NOT:
 	.dw	nativeWord
diff --git a/forth/icore.fs b/forth/icore.fs
index e0067bd..ea4ef4b 100644
--- a/forth/icore.fs
+++ b/forth/icore.fs
@@ -78,9 +78,14 @@
     HERE @ 1 + HERE !
 ;
 
+( The NOT is to normalize the negative/positive numbers to 1
+  or 0. Hadn't we wanted to normalize, we'd have written:
+  32 CMP 1 - )
+: WS? 33 CMP 1 + NOT ;
+
 : TOWORD
     BEGIN
-    C< DUP WS? NOT IF EXIT THEN DROP
+    C< DUP _c WS? NOT IF EXIT THEN DROP
     AGAIN
 ;
 
@@ -96,7 +101,7 @@
         OVER !                  ( a )
         1 +                     ( a+1 )
         C<                      ( a c )
-        DUP WS?
+        DUP _c WS?
     UNTIL
     ( a this point, PS is: a WS )
     ( null-termination is already written )