From b72901175e4590fbe0a881a0fa122e51b431b1b9 Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Tue, 17 Mar 2020 16:02:01 -0400
Subject: [PATCH] forth: Word-ify "[']" and "'"

---
 apps/forth/dict.asm       | 55 +++++++++++++++++++++++++++++------------------
 apps/forth/dictionary.txt |  4 +++-
 2 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/apps/forth/dict.asm b/apps/forth/dict.asm
index 581b9d2..ca4f22a 100644
--- a/apps/forth/dict.asm
+++ b/apps/forth/dict.asm
@@ -449,44 +449,57 @@ LITS:
 	ld	(HERE), de
 	jp	next
 
-	.db	"'"
-	.fill	6
+	.db	"(find)"
+	.fill	1
 	.dw	LITS
 	.db	0
-FIND:
+FIND_:
 	.dw	nativeWord
 	call	readword
 	call	find
 	jr	z, .found
 	; not found
+	push	hl
 	ld	de, 0
-.found:
 	push	de
 	jp	next
+.found:
+	push	de
+	ld	de, 1
+	push	de
+	jp	next
+
+	.db	"'"
+	.fill	6
+	.dw	FIND_
+	.db	0
+FIND:
+	.dw	compiledWord
+	.dw	FIND_
+	.dw	CSKIP
+	.dw	FINDERR
+	.dw	EXIT
 
 	.db	"[']"
 	.fill	4
 	.dw	FIND
 	.db	0b01		; IMMEDIATE
 FINDI:
-	.dw	nativeWord
-	call	readword
-	call	find
-	jr	nz, .notfound
-	ld	hl, (HERE)
-	push	de		; --> lvl 1
-	ld	de, NUMBER
-	call	DEinHL
-	pop	de		; <-- lvl 1
-	call	DEinHL
-	ld	(HERE), hl
-	jp	next
-.notfound:
-	ld	hl, .msg
-	call	printstr
-	jp	abort
-.msg:
+	.dw	compiledWord
+	.dw	FIND_
+	.dw	CSKIP
+	.dw	FINDERR
+	.dw	LITN
+	.dw	EXIT
+
+	.db	0b10		; UNWORD
+FINDERR:
+	.dw	compiledWord
+	.dw	DROP		; Drop str addr, we don't use it
+	.dw	LIT
 	.db	"word not found", 0
+	.dw	PRINT
+	.dw	ABORT
 
 ; ( -- c )
 	.db "KEY"
diff --git a/apps/forth/dictionary.txt b/apps/forth/dictionary.txt
index a556349..7aa130f 100644
--- a/apps/forth/dictionary.txt
+++ b/apps/forth/dictionary.txt
@@ -32,10 +32,12 @@ directly, but as part of another word.
 "*I*" in description indicates an IMMEDIATE word.
 
 *** Defining words ***
+(find) x    -- a f          Read word x and find it in dict. If found, f=1 and
+                            a = wordref. If not found, f=0 and a = string addr.
 : x ...     --              Define a new word
 ;           R:I --          Exit a colon definition
 ,           n --            Write n in HERE and advance it.
-' x         -- a            Push addr of word x to a. If not found, push 0
+' x         -- a            Push addr of word x to a. If not found, aborts
 ['] x       --              *I* Like "'", but spits the addr as a number
                             literal. If not found, aborts.
 (           --              *I* Comment. Ignore rest of line until ")" is read.