From 77ecbc4918d05bbe96f2a8a7159aabea869c2397 Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Wed, 25 Mar 2020 20:06:06 -0400
Subject: [PATCH] forth: Forth-ify "'" and "[']"

---
 forth/core.fs   |  6 ++++++
 forth/forth.asm | 35 +----------------------------------
 2 files changed, 7 insertions(+), 34 deletions(-)

diff --git a/forth/core.fs b/forth/core.fs
index a6a0ed1..b1badbc 100644
--- a/forth/core.fs
+++ b/forth/core.fs
@@ -4,6 +4,9 @@
 : LIT ROUTINE S [LITN] , ;
 : LITS LIT SCPY ;
 : LIT< WORD LITS ; IMMEDIATE
+: _err LIT< word-not-found (print) ABORT ;
+: ' WORD (find) SKIP? _err ;
+: ['] WORD (find) SKIP? _err LITN ; IMMEDIATE
 : COMPILE ' LITN ['] , , ; IMMEDIATE
 : [COMPILE] ' , ; IMMEDIATE
 : BEGIN H ; IMMEDIATE
@@ -15,6 +18,9 @@
   BTW: Forth lines limited to 64 cols because of default
   input buffer size in Collapse OS
 
+  "_": words starting with "_" are meant to be "private",
+  that is, only used by their immediate surrondings.
+
   COMPILE: Tough one. Get addr of caller word (example above
   (bbr)) and then call LITN on it. )
 
diff --git a/forth/forth.asm b/forth/forth.asm
index 69de98d..c6765e2 100644
--- a/forth/forth.asm
+++ b/forth/forth.asm
@@ -991,43 +991,10 @@ FIND_:
 	push	de
 	jp	next
 
-	.db	"'"
-	.fill	6
-	.dw	$-FIND_
-	.db	0
-FIND:
-	.dw	compiledWord
-	.dw	WORD
-	.dw	FIND_
-	.dw	CSKIP
-	.dw	FINDERR
-	.dw	EXIT
-
-	.db	"[']"
-	.fill	4
-	.dw	$-FIND
-	.db	0b01		; IMMEDIATE
-FINDI:
-	.dw	compiledWord
-	.dw	WORD
-	.dw	FIND_
-	.dw	CSKIP
-	.dw	FINDERR
-	.dw	LITN
-	.dw	EXIT
-
-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"
 	.fill 4
-	.dw $-FINDI
+	.dw $-FIND_
 	.db 0
 KEY:
 	.dw nativeWord