From 24e9fa0c30ed549c7588edee315c371bd4bfc662 Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Mon, 4 May 2020 08:10:18 -0400
Subject: [PATCH] Add word NL

---
 blk/062        |   9 ++++-----
 blk/081        |   2 +-
 blk/084        |   6 +++---
 blk/103        |   2 +-
 blk/130        |   6 +++---
 blk/269        |   2 +-
 blk/411        |   1 +
 blk/440        |   3 ++-
 blk/444        |   2 +-
 blk/456        |   2 +-
 blk/459        |   2 +-
 emul/forth.bin | Bin 5624 -> 5666 bytes
 emul/stage1.fs |   2 +-
 13 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/blk/062 b/blk/062
index 9a210da..6689076 100644
--- a/blk/062
+++ b/blk/062
@@ -1,11 +1,10 @@
 WORD    -- a   Read one word from buffered input and push its
                addr.
 There are also ascii const emitters:
-BS
-CR
-LF
-SPC
-
+BS CR LF SPC CRLF
+NL is an indirect word (see B80) that aliases to CRLF by
+default and that should generally be used when we want to emit
+a newline.
 
 
 
diff --git a/blk/081 b/blk/081
index 4ab6143..c4aa45a 100644
--- a/blk/081
+++ b/blk/081
@@ -4,7 +4,7 @@ RAMSTART  INITIAL_SP           +55       (key) override
 +04       HERE                 +59       blk's variables
 +06       C<?                  +5b       z80a's variables
 +08       C<* override         +5d       adev's variables
-+0a       RESERVED             +5f       FUTURE USES
++0a       NLPTR                +5f       FUTURE USES
 +0c       C<*                  +70       DRIVERS
 +0e       WORDBUF              +80       RAMEND
 +2e       BOOT C< PTR
diff --git a/blk/084 b/blk/084
index 19f6d46..ef7b8a5 100644
--- a/blk/084
+++ b/blk/084
@@ -4,6 +4,9 @@ address. Most of the time, it points to RAM+2, but sometimes,
 when maintaining alternative dicts (during cross compilation
 for example), it can point elsewhere.
 
+NLPTR points to an alternative routine for NL (by default,
+CRLF).
+
 FUTURE USES section is unused for now.          
 
 DRIVERS section is reserved for recipe-specific
@@ -11,6 +14,3 @@ drivers. Here is a list of known usages:
 
 * 0x70-0x78: ACIA buffer pointers in RC2014 recipes.
 
-
-
-
diff --git a/blk/103 b/blk/103
index 559c42c..70068f7 100644
--- a/blk/103
+++ b/blk/103
@@ -1,5 +1,5 @@
 VARIABLE ACC
-: _LIST ." Block " DUP . CRLF LIST ;
+: _LIST ." Block " DUP . NL LIST ;
 : _NUM
     ACC @ SWAP _pdacc
     IF _LIST 0 THEN
diff --git a/blk/130 b/blk/130
index 8689095..d655904 100644
--- a/blk/130
+++ b/blk/130
@@ -4,8 +4,8 @@
     DUP ROT SWAP H@ 4 +         ( u src u dst )
     SWAP MOVE                   ( u )
     4 + DUP CURRENT @ WORD( +   ( u we )
-    DUP .X CRLF
-    SWAP CURRENT @ PREV + DUP .X CRLF ( we wr )
+    DUP .X NL
+    SWAP CURRENT @ PREV + DUP .X NL ( we wr )
     BEGIN                       ( we wr )
         DUP ROT                 ( wr wr we )
         H@ @ H@ 2+ @            ( wr wr we ol o )
@@ -13,4 +13,4 @@
         DUP PREV SWAP           ( wr oldwr )
         WORD( SWAP              ( we wr )
         DUP 4 - H@ <= ( are we finished? )
-    UNTIL H@ 4 + .X CRLF ;
+    UNTIL H@ 4 + .X NL ;
diff --git a/blk/269 b/blk/269
index 73130e0..4277618 100644
--- a/blk/269
+++ b/blk/269
@@ -1,3 +1,3 @@
 ( b1 b2 -- )
-: XPACKR 1+ SWAP DO I DUP . CRLF XPACK LOOP ;
+: XPACKR 1+ SWAP DO I DUP . NL XPACK LOOP ;
 
diff --git a/blk/411 b/blk/411
index 4dc7f55..38365a9 100644
--- a/blk/411
+++ b/blk/411
@@ -4,6 +4,7 @@
     0 0x08 RAM+ !  ( 08 == C<* override )
     0 0x53 RAM+ !  ( 53 == (emit) override )
     0 0x55 RAM+ !  ( 55 == (key) override )
+    0 0x0a RAM+ !  ( NLPTR )
     ( 0c == C<* )
     LIT< (boot<) (find) DROP 0x0c RAM+ !
     ( boot< always has a char waiting. 06 == C<?* )
diff --git a/blk/440 b/blk/440
index d4bad68..96b1ba4 100644
--- a/blk/440
+++ b/blk/440
@@ -3,7 +3,8 @@
 : CR 13 EMIT ;
 : CRLF CR LF ;
 : SPC 32 EMIT ;
+: NL 0x0a RAM+ @ ( NLPTR ) DUP IF EXECUTE ELSE DROP CRLF THEN ;
 
 : (wnf) (print) SPC ABORT" word not found" ;
-: (ok) SPC ." ok" CRLF ;
+: (ok) SPC ." ok" NL ;
 
diff --git a/blk/444 b/blk/444
index cbc4472..57fde9a 100644
--- a/blk/444
+++ b/blk/444
@@ -12,5 +12,5 @@
         IF DROP '.' THEN
         EMIT
     LOOP
-    CRLF
+    NL
 ;
diff --git a/blk/456 b/blk/456
index 5378b08..7b48c02 100644
--- a/blk/456
+++ b/blk/456
@@ -5,7 +5,7 @@
     16 0 DO
         I 1+ .2 SPC
         64 I * BLK( + (print)
-        CRLF
+        NL
     LOOP
 ;
 
diff --git a/blk/459 b/blk/459
index 29bb9b5..a6c9ce6 100644
--- a/blk/459
+++ b/blk/459
@@ -1,2 +1,2 @@
 ( b1 b2 -- )
-: LOADR 1+ SWAP DO I DUP . CRLF LOAD LOOP ;
+: LOADR 1+ SWAP DO I DUP . NL LOAD LOOP ;
diff --git a/emul/forth.bin b/emul/forth.bin
index 6821b9ae178f0374e88452e4c8046eb8125b82f8..1087d29bbb246b699e7612862244d776a30bf74c 100644
GIT binary patch
delta 1553
zcmYLJT}&KR6h3!mfMsU)&d&a{1tOhpw{+JcO^PjPt-=nluyk3FT~?~GMEPq|0t8w?
zQbSt&DK9i|ACMI_>4Q8FlbSWbXi8#gG`<-V+h~2!7gM9Y5eq)7=gchna5FjIJ?FdU
z=R5QG*zH>N-YVSt8~{T5K2g6fFX>QBP{o6Ci(M0y>bc+<bp%{6%hI4gn=1{a@IzUR
zm{k|pW1(m@EFz9+)r0lg0nLKuuFmd6vX#R-oPaO}w7D#JsffS44;Ju(Agi@4k#fUZ
zJg-_1Yl|gPDjH!(V@O{8NFtx!R3?!O*zgF!;$y9~^FBV4h?m0+bhc5|1POK!&9t|s
zg77BKvAp`bw#f>T1+B?+tAUt9?0EivpBIhpH>z&B_ZXVHQt3=AmGOg%-*mUR-V+bp
z4J<EoPmN}J+FZpKMU!W_Y{6rK3=85%Pn4NL=G|JomSbo6cS=DzA};Xu>UXiS$i(EO
zu`AIKl=1bF9J?WnVE^`GVyogSUSIJO?@;=Yc8gQJF{`U56RLu@`L6KlN9MM;Rf3&L
zSAoP$oWUx$AQ{(eOSP@$9>?+&tz_H-3Ln<{bPLkm%__(kXxf*l<X+$%MVE7IZ>XiP
z!Cpi6$n@B7)Pxeg#pm@9Opi~72hFkZE9UU{)v-a$kaCHPUq&Cr_87m6;F9=EPe)hz
zfU+q)(sRs&(=b#*MQ$)GlBeO1f(4Crz_>0)yy9u^$x}PnZ!bKQ2ED7Cjs<mn6?Rd;
z9!iVeMXv?@93zPC43gy7qIX_==&dNH%XxiKF~yhO(@(8((=!4;7jDZNjLs64(bC)5
zeH}CG)4yd|rO!@<`u&ACYE-jdMcfGWUo%ibsfg1Z2^=%(#%7Hgiwc>MOJl>MQ5{Ng
zK5Isf-7*Ri$qDgSr=mf`ZyCD0W^^LI0v3=pr;yjY-XXp*%<wu5e{yhiY``8qIc(VO
zD$YYinJcg>G~dyKR2~hNsBpFLae7Xd3sM#d?~CVsPt4sl4*EzsyM;b|&7fy2=xIr&
z&Q{{Q$oaTEP&e2i8j-K~9K1srDlw7x4$9IA3ZKBBJZ{YkHaKeFKw(AN(e4^y_|#{D
z+s3o_8z_c}KYfSiLVlED^4y^(-55>_Qv{wP#Sul(ZpoadzEN-yi8vmvJv&PFjNb%M
zRxl?d4eN+dO6TpTu^q~eMx6bw4&|c1APp#US^PK|MA13x*X1~#S>`xc5Ks1|+YexF
z7ZIkZeC;IMWT5*m{v4war^zHuvI|m!P2tcUs=?r_{TwRt1Z@jVMg<a)ath}42nsWq
zNN4sV<2L5+g$`wtEz8UDfIOkp2Ih4WnqWZQlxF-Z5-x{sik3jwGfjKj6>F)W#KqOX
zVSU?A_1D?ehT*zc4>YoE@mrv_EaF|#-w&9gGWbmSjDJ90kxbbX7lJ2;9P7ADeTm7W
z{J;KFKIu7;i6Q^rxZLy$%K5|aVz2>g48sS(IDQ}bLeM|;`V{=*3PJPu=;$jGQ$uD~
OnzmR^l;h4l3+!KM-CM5!

delta 1432
zcmYLIO>7%g5T3WYX`Ef}d){p9HjQbw!K7XYX;qX~Ei`R5aU7@4Cd6)<3Q8pG#GtxP
z<Q7#4qE<`!DTi3iJ4CfWpx&Zfs1(T(mmYdTiK>8vgj5dvNL)Y!4oDG)n0ad#4y)D7
zeDlrU_wIM^yr4e12amo2fSuq2_1hNyYs+a;<Pr5;@Ti&tA1sm-C=mChU=MuP9Ok#x
zJLC^ewXXaDEr$^YIw5+!Fl$3|(;8VM4!m~wQW)N+wnjAv2F6Cm6Ui8bk32^Nnc_ag
zH2jxBa0dgz<;3C%*AE}iRn>w1cz?oG(TG3_Q&#yGT8OOjsummFMApPm3*5q3PQ+9T
zB-lo8dN}3=;Wn+1RrN=$N@|h=v1BS{ps&tTNB$pQ<q7|L9XI?>83xAORJz|yo8Y52
z{Bhr1{*(U%)@|3jw2&V6H7fEEeYv@$TOdP;|DxL@#C1BZ*;<7hqgzT%>fmqDVY0*@
z&@d_U$MmK4Ejpr1WBxi7v-Ue<6Y0(l_>lg|_p|3p>(pt&4Wv3iq82W_OdUuLX`ZEe
z*1$yF(i>KCNC$<!&Rpg|YJ5Ni851op=v{+C6J4hZtP`%!6|+`h?wU0__f8>;4Tw_F
zxy!bN1OhO3SwU}}|IAW$nP!x#^pI7E1t(#qDTh~I!<&|A3VyFSaHa<cW%4fLZv=X$
zwsCO*cp{w&l&Sa}=$UHwng;Sj$_BCl2c{`z2)a{9QX$#E0>i>EqEyMUyewA;lPwVN
zD#k=~NeS`a0w-TA(~zEnA8PmIH6p$|PC9sgbo?f^?Xs`Qq%!5Tw->K`m%nNpAm8(O
zqjP$~Kz+E;`bH$Eo3<Yp<QPkeFr#l5X7e_KJ$RF%Q6V!%O%hr`|C?9sAo^zvCKruS
z<QD=LR!I@41$LJIWmu8VP@>UdHebltozU#TZ+dVQZ=j-N71-jvt%nbak;Op;6>buX
zi*ih^Ns~yp$=_{#<~TS0Hf~8d_^0Nwq9MvSFfo{PU)hg06yPJcr5yOdOVI@RmDU;l
zxHa4^w0{A<M8!FV*y@V3t#Km)pK#ecQQB!mO(oAAdftyjLgEcapOB7#H|)XmMX?ME
zJ8XEOb%gJ!Z428q@leVNc88=9h8|J=qE{YgRJJw2Iqe%!`plY?QA*wTt9M`{xZ7lM
z7{5hQ2RJa4Jf9lghrRWoTdew1(}SNi5MDJaM5Ht}hZ+=iP0~GzI_;q@OrG@0q4bW4
z7b4cJf>4HX92VFviYA#zrS~G^2KFELPk0%5UXj{_7|%jRu1c=CBH=4wAzo;U=vTx8
z9P1x!7mf4J+n!|`rkKCSn>GR$_&055$Obop-Oal!&#tzG_+aqm7T3(kE0QIL_{YIs
sR=19zz!m66-)8WjId4YbXi&#VB5*Aj#{WaU8{Fp?wG%D)UQPq~7p(w18vp<R

diff --git a/emul/stage1.fs b/emul/stage1.fs
index d90a0ca..73d3f51 100644
--- a/emul/stage1.fs
+++ b/emul/stage1.fs
@@ -19,7 +19,7 @@
     ['] EFS! BLK!* !
     RDLN$
     LIT< _sys [entry]
-    ." Collapse OS" CRLF
+    ." Collapse OS" NL
     INTERPRET
 ;