From 1e85d60d89171234b530f99e0a29fab0992e56c9 Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Tue, 31 Mar 2020 15:26:43 -0400
Subject: [PATCH] forth: Forth-ify ","

---
 emul/forth/z80c.bin | Bin 1720 -> 1748 bytes
 forth/forth.asm     |  17 ++---------------
 forth/icore.fs      |  15 ++++++++++-----
 3 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/emul/forth/z80c.bin b/emul/forth/z80c.bin
index d1c5da6b14d81e633858a3c3d3d65324dbceaf8f..9b00ce4efd37ff92e71bec86dff781de4fe13505 100644
GIT binary patch
delta 207
zcmdnNdxdv{3o}QY_*70=PFMELKFs?V<#l)&82K31vz}ny&I}?I7?>EmfvoM!o(#@9
zQj>XE9T^)Y`?Jak&Sr0B+76Uw1j?JT2QoEGu49#D+%<U)t0J>2d(z|stdc<9E!N6Z
zEe=lxAI}iKKn4~*1_dB=Wp`!wWU%68Xyjvf!LGo-2Nc=GF34KIAjS~L)W=f5z`?ML
vA%cMgC?3JU#jpVAkYx-TIU*Qt{r6<BHU;TZVDJRWrm`e6c{0TFGcW=GjNL71

delta 179
zcmcb@yMuRw3p0n4cqJzzXD7pEALf0G%+5M|lQmf#8B-=_v&sq9vo|wsXI5ZfWbkG-
zWe;RZnLLYCmT}(X9juDXoeXZ1@32Y&dEZzoQ~5YN8GJlL`~n$R_!ty`uoDP98LW62
z8u=K`uq!a|0r~UT1z8Ii#25mZ`dA7WI2e{OL@=-b#UmKF7#6UeU|z;Bl_P@T)_+e1
XYg3Ru1)vF?45=*1Or8w!{0xi$;gl!=

diff --git a/forth/forth.asm b/forth/forth.asm
index c9e50dd..877367d 100644
--- a/forth/forth.asm
+++ b/forth/forth.asm
@@ -126,24 +126,11 @@ CBR:
 	ld	(IP), hl
 	jp	next
 
-	.db	","
-	.dw	$-CBR
-	.db	1
-WR:
-	.dw	nativeWord
-	pop	de
-	call	chkPS
-	ld	hl, (HERE)
-	ld	(hl), e
-	inc	hl
-	ld	(hl), d
-	inc	hl
-	ld	(HERE), hl
-	jp	next
+.fill 23
 
 ; ( addr -- )
 	.db "EXECUTE"
-	.dw $-WR
+	.dw $-CBR
 	.db 7
 EXECUTE:
 	.dw nativeWord
diff --git a/forth/icore.fs b/forth/icore.fs
index 6044d14..0ad9d1c 100644
--- a/forth/icore.fs
+++ b/forth/icore.fs
@@ -146,6 +146,11 @@
     [ 48 @ LITN ] _c @ EXECUTE
 ;
 
+: ,
+    _c HERE _c @ _c !
+    _c HERE _c @ 2 _c + _c HERE _c !
+;
+
 : C,
     _c HERE _c @ _c C!
     _c HERE _c @ 1 _c + _c HERE _c !
@@ -191,7 +196,7 @@
     _c DUP _c HERE _c ! ( h h' )
     _c SWAP _c -       ( sz )
     ( write prev value )
-    _c HERE _c @ _c CURRENT _c @ _c - ,
+    _c HERE _c @ _c CURRENT _c @ _c - _c ,
     ( write size )
     _c C,
     _c HERE _c @ _c CURRENT _c !
@@ -225,7 +230,7 @@
   it to avoid bootstrapping issues )
 : LITN
     ( 32 == NUMBER )
-    32 , ,
+    32 _c , _c ,
 ;
 
 ( : and ; have to be defined last because it can't be
@@ -236,19 +241,19 @@
     _c (entry)
     ( We cannot use LITN as IMMEDIATE because of bootstrapping
       issues. 32 == NUMBER 14 == compiledWord )
-    [ 32 , 14 , ] ,
+    [ 32 , 14 , ] _c ,
     BEGIN
     _c WORD
     _c (find)
     ( is word )
-    IF _c DUP _c IMMED? IF EXECUTE ELSE , THEN
+    IF _c DUP _c IMMED? IF EXECUTE ELSE _c , THEN
     ( maybe number )
     ELSE _c (parse*) _c @ EXECUTE _c LITN THEN
     AGAIN
 ; IMMEDIATE
 
 : Y
-    ['] EXIT ,
+    ['] EXIT _c ,
     _c R> _c DROP     ( exit : )
 ; IMMEDIATE