From 1fb062e12198b2cfe15f12173a2b4afee4126fe0 Mon Sep 17 00:00:00 2001 From: Virgil Dupras Date: Sat, 2 Jan 2021 09:45:08 -0500 Subject: [PATCH] Remove LF word Also, remove extraneous uses of it. In the rdln routine, we would spit a new line after each line input, but that NL was spurious: we already spit the newline we receive as it is typed. --- blk.fs | 11 ++++------- cvm/stage.bin | Bin 4977 -> 4963 bytes 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/blk.fs b/blk.fs index 3b0fd85..398e7c1 100644 --- a/blk.fs +++ b/blk.fs @@ -1717,8 +1717,8 @@ with "390 LOAD" ( ----- 356 ) SYSVARS 0x53 + :** EMIT : STYPE C@+ ( a len ) 0 DO C@+ EMIT LOOP DROP ; -: BS 8 EMIT ; : LF 10 EMIT ; : CR 13 EMIT ; -: CRLF CR LF ; : SPC 32 EMIT ; +: BS 8 EMIT ; : CR 13 EMIT ; +: CRLF CR 10 EMIT ; : SPC 32 EMIT ; SYSVARS 0x0a + :** NL : ERR STYPE ABORT ; : (uflw) LIT" stack underflow" ERR ; @@ -1970,10 +1970,8 @@ SYSVARS 0x0c + :** C<* C@+ DUP 0x20 0x7e =><= NOT IF DROP '.' THEN EMIT LOOP NL ; : DUMP ( n a -- ) - LF SWAP 8 /MOD SWAP IF 1+ THEN - 0 DO _ LOOP -; + 0 DO _ LOOP ; ( ----- 378 ) ( handle backspace: go back one char in IN>, if possible, then emit BS + SPC + BS ) @@ -2009,8 +2007,7 @@ SYSVARS 0x55 + :** KEY? ( Read one line in input buffer and make IN> point to it ) : (rdln) ( EOT or less triggers line flush ) - (infl) BEGIN (rdlnc) 5 < UNTIL - LF IN( IN> ! ; + (infl) BEGIN (rdlnc) 5 < UNTIL IN( IN> ! ; ( And finally, implement C<* ) : RDLN< IN> @ C@ diff --git a/cvm/stage.bin b/cvm/stage.bin index 1585c77d475a511ddf21cd1b3b89eb5cf1aadfe2..b317698956b2312795d59053628c18aa1f9b1bff 100644 GIT binary patch delta 1728 zcmYjRU2Icj7=FLgb9zpD`ainyb6UpA7?jX5(3>*Zdb$FeWvyL@GqZsXm?n@7*`gBB zp;Qg2NU|>@j+>Hr(V37DKw?akJ0V2$LWy2zhzaU$hz4c|2_yP^r(kGu&iVTOKkxgz z-`zF0*DN9Ye)O$WIvd2v`gLAdaz*C9$&H?$Ws{s#lMU+6r94wg2lMjhlrY{eE6sSn ztrXcL|3&$hZRR!mROnwNPBw!^?bhdN{d2A^Eb?9ICN{!PsO^DKwM-_p&?6~M%4ssF z%5SLcp{i<7A^T!B-|Zzkw-$I&t_&aS5sHoQ>N)ag?M1DZ(^XQLCyrhnPWY zEu(cUFfz6C@Ji*=$wJxqKDX7wg8Pm zX6E@-t?1W+Gs14;nV`BJ`7#6jJC>3H^9Td#lKzxWS0jANB)t9~)lpptLhJ`COg%JW zD{RKfh}rbydI42tLER*hIXf(Wty|)BcV`g5W>}jZ)c4SKK*QKhqn3NN1l<+Daxblf z=TW^%)4Iq~;vv@yY&joug;|P!?CR*OxN5R^42lgdBZ)1rORh^UgLXSHIzg)h2wSF0 zt_L8mjM#h7#R$7&nLUuX!@XgLT`{P8U}tU+xvFr{s0m-7uYq-Y=vP;Q77=lHJWMur z4C6f|3H+e8_%jDlh+UTv?3jBaJHs!yBP%|2i`-6&(tu==8)@HhgWrSvZ}+D5%Wjht z(rj_Me@YVm2IadmeH|;%IT5rSwa3XhgFl80Rt9*%^Nh05W6}se>1kR!jb{2RG}}S% zdM**o_CQWqP`l7i55|AP6Ajvx1buE$PhTOO&*jsFz2pErbnmjIF%_{VXaGAEC;0V} zGPV;!|ia3diN7OCy)AjE4^pd=L{K)uuM=$BA zv4aOohsO6eXZrzN`Nn5ZBKjt{B$iXga*8EOM58`TUx<{)qTR!LUp){Ye%!xdvVvt7 z#b)xK^R;G(^F#VHGiv@zQcUCb<%st5vK~@8fbb2xpDa! zl+N_yRuNUTBF+rkCwB!((i}9XtEI`(^jh_DBtMTkwj@<;b7;Bnjh<)@~@qk91lF zb01l^jzOU>5oC;%!5U@5u~G*8!-5;^gHhNhrTb$OMp-GW9dsXMe<<7YUhFV%x#ynm zkKgm$+5d2VIpFUXwNdCRW0d)ed{%y)w;4S$a6|_?y}?)8f8}rU8VvMz+36$xXsAli zAdnfKoNx4kl|;ccmrb9X@MT^;H9J0;nK#ArQ{#=*AdoA36cpclW_HXsmC5?XGiRp8 zs_2}MBIoH3!gu6p`hoSL*Jf=6iv|m&*Y~B@=Yq*RO%3r7nWl?kn`c4Hfey8>&9#EC z1RAW;FT^(Qs;EIS{z5#_tzbfwECEyeQQU$RxJOmVKNyg_Bp_+PblkurT_koX2lvEQ z5Wj+U6s`45vYZ z1ccm_wou!0n*J;q;zLOX3p}I;Z8N@Zn+C(Drn0kVQ{^C%Pb}2(p)Jh~a(*I_ytqm? zY~>w>bPd(I65&uX?8GuQZ8~tkN_#$(h=g<_Tm};P-QP?BR@V{qX3UL36=`%MKuld_6qSpfiZ`@RL58a~$o=JBmDeG-w&BLRkMv)*b5(4Myy!#O#Am zaS2H$27cFxrHs)# z&O_B3P8|f0u(n6H`3oHLph2SBh#mFP7FQ*Cg7&zc6rOSEfa~F^3>2_`s+oT;Lb>Fd zSz9=v&n)g3^b!|N{JN{DLKT8=Rf9+@8BX*k!pW0hBL>}eRqbsT5#3oB!To6kw2K0l znYhBMv_&~Ww&|GSuPexGR%}hYcqI&lwS&>i_+>RIn?gTU8q)>29+V-oT}(a%Y-^2p zsJr<+L;%AHN2Zk$E1@E*h)o^EG;_dGo>qeJ*N(JVLnxFi3MRrhRQ1p!>S3(tCAAIz z-&dPC4E&ASviPN{<5W9%9pXq`b~5U3d{lu^EaPdhgWsL+j4KNK$lTevYqluJU75+r z^z_^*Uwi;d7jCK=1e+ERJ!~&|+)K7^!KNk^r_ETx4r}DZ$rmR)K+m`jEat^D-UcHc z?^hs)oe2WtNF?WGYi&f5u?mEfj@`+d?g9>Y9q%b=G^AH>wH{#r1tGd=TPCZbf#(Wk z9ZVuKuxMzdK?X7A$-#z%XDJIfxI9izXcup}>lL_x^X=(`H!wyk{QefQL?l zurYuKg=JNbewN7?AM>QSHI!gpwUwqMYUWEZ_%*zzX|7;d!U<5paL>Ro8ZE2(4@TF0uK)l5