From edcd80e3a63131d39c234c73b4027ef514d34277 Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Fri, 27 Mar 2020 11:49:50 -0400
Subject: [PATCH] forth: Forth-ify "(parse)"

---
 emul/forth/z80c.bin | Bin 558 -> 578 bytes
 forth/forth.asm     |  20 ++------------------
 forth/icore.fs      |   6 ++++++
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/emul/forth/z80c.bin b/emul/forth/z80c.bin
index d47ac11c51f52794d7f7afa5ecd6492434a64da5..a5478a333ee1034890dd4d53ccc65fa00ba182c2 100644
GIT binary patch
delta 76
zcmZ3-a)@QaaYn(t5(*4#4Dpf*3<d1*lFnSWCf{JR(bFhMEGkabG-6<X#puHNjxC?b
ek;$5yq45=?0)rzH2lIapOEwU8WQrGNU<3dyuoGke

delta 56
zcmX@avW{iLaYn(55(*4#48@WP3<d1PlHpwMCf{JRk+RldXne(}z~IQl!Tg`Yk`06%
Jnc{^R7y-pS4paaD

diff --git a/forth/forth.asm b/forth/forth.asm
index 6e68927..fa708fb 100644
--- a/forth/forth.asm
+++ b/forth/forth.asm
@@ -1123,23 +1123,7 @@ PARSED:
 	jp	next
 
 
-	.db	"(parse)"
-	.dw	$-PARSED
-	.db	7
-PARSE:
-	.dw	compiledWord
-	.dw	PARSED
-	.dw	CSKIP
-	.dw	.error
-	; success, stack is already good, we can exit
-	.dw	EXIT
-
-.error:
-	.dw	compiledWord
-	.dw	LIT
-	.db	"unknown word", 0
-	.dw	PRINT
-	.dw	ABORT
+.fill 41
 
 
 ; Indirect parse caller. Reads PARSEPTR and calls
@@ -1154,7 +1138,7 @@ PARSEI:
 ; Spit name (in (HL)) + prev in (HERE) and adjust (HERE) and (CURRENT)
 ; HL points to new (HERE)
 	.db	"(entry)"
-	.dw	$-PARSE
+	.dw	$-PARSED
 	.db	7
 ENTRYHEAD:
 	.dw	compiledWord
diff --git a/forth/icore.fs b/forth/icore.fs
index d7ab7ba..e042293 100644
--- a/forth/icore.fs
+++ b/forth/icore.fs
@@ -55,6 +55,12 @@
     AGAIN
 ;
 
+( This is only the "early parser" in earlier stages. No need
+  for an abort message )
+: (parse)
+    (parsed) SKIP? ABORT
+;
+
 ( ; has to be defined last because it can't be executed now )
 : X             ( can't have its real name now )
     ['] EXIT ,