From db9885b8cf51b302e3b4935a93f05690de0c9fa8 Mon Sep 17 00:00:00 2001 From: Virgil Dupras Date: Fri, 15 May 2020 12:50:14 -0400 Subject: [PATCH] Rename (find) to FIND I hadn't noticed that this word was almost ANS compliant. --- blk/037 | 2 +- blk/131 | 9 --------- blk/156 | 2 +- blk/263 | 2 +- blk/393 | 4 ++-- blk/394 | 2 +- blk/403 | 2 +- blk/410 | 4 ++-- blk/432 | 2 +- blk/437 | 2 +- emul/forth.bin | Bin 5938 -> 5936 bytes 11 files changed, 11 insertions(+), 20 deletions(-) delete mode 100644 blk/131 diff --git a/blk/037 b/blk/037 index ea01792..0e74fab 100644 --- a/blk/037 +++ b/blk/037 @@ -10,7 +10,7 @@ Entry management , n -- Write n in HERE and advance it. ALLOT n -- Move HERE by n bytes C, b -- Write byte b in HERE and advance it. +FIND w -- a f Like '?, but for w. EMPTY -- Rewind HERE and CURRENT where they were at system initialization. - (cont.) diff --git a/blk/131 b/blk/131 deleted file mode 100644 index f2a63aa..0000000 --- a/blk/131 +++ /dev/null @@ -1,9 +0,0 @@ -( Relink a regular Forth full interpreter. ) -: RLCORE - LIT< [ (find) DROP ( target ) - DUP 3 - @ ( t prevoff ) - ( subtract [ name length ) - 1- ( t o ) - RLDICT -; - diff --git a/blk/156 b/blk/156 index fa80f05..da74eab 100644 --- a/blk/156 +++ b/blk/156 @@ -1,4 +1,4 @@ : EMPTY - LIT< _sys (find) NOT IF ABORT THEN + LIT< _sys FIND NOT IF ABORT THEN DUP HERE ! CURRENT ! ; diff --git a/blk/263 b/blk/263 index b48b461..e7ed5c9 100644 --- a/blk/263 +++ b/blk/263 @@ -11,5 +11,5 @@ VARIABLE XCURRENT : X['] XCON ' _xapply LITA XCOFF ; : XCOMPILE XCON ' _xapply LITA - LIT< , (find) DROP _xapply , XCOFF ; + LIT< , FIND DROP _xapply , XCOFF ; : X[COMPILE] XCON ' _xapply , XCOFF ; diff --git a/blk/393 b/blk/393 index d4092d0..10a69c9 100644 --- a/blk/393 +++ b/blk/393 @@ -6,11 +6,11 @@ : XYPOS 0x40 RAM+ ; ( w -- a f ) -: (find) CURRENT @ SWAP _find ; +: FIND CURRENT @ SWAP _find ; : QUIT (resRS) 0 0x08 RAM+ ! ( 08 == C<* override ) - LIT< (main) (find) DROP EXECUTE + LIT< (main) FIND DROP EXECUTE ; 1 25 LOADR+ ( xcomp core low ) diff --git a/blk/394 b/blk/394 index 36de94d..99faa9c 100644 --- a/blk/394 +++ b/blk/394 @@ -1,5 +1,5 @@ : ABORT (resSP) QUIT ; -: ERR LIT< (print) (find) IF EXECUTE THEN ABORT ; +: ERR LIT< (print) FIND IF EXECUTE THEN ABORT ; : = CMP NOT ; : < CMP -1 = ; : > CMP 1 = ; : 0< 32767 > ; : >= < NOT ; : <= > NOT ; : 0>= 0< NOT ; : >< ( n l h -- f ) 2 PICK > ( n l f ) ROT ROT > AND ; diff --git a/blk/403 b/blk/403 index 752f865..b97157c 100644 --- a/blk/403 +++ b/blk/403 @@ -4,5 +4,5 @@ (parseb) IF EXIT THEN (parsed) IF EXIT THEN ( nothing works ) - LIT< (wnf) (find) IF EXECUTE ELSE ABORT THEN + LIT< (wnf) FIND IF EXECUTE ELSE ABORT THEN ; diff --git a/blk/410 b/blk/410 index 6e8981c..852716f 100644 --- a/blk/410 +++ b/blk/410 @@ -1,7 +1,7 @@ -: '? WORD (find) ; +: '? WORD FIND ; : ' '? (?br) [ 4 , ] EXIT - LIT< (wnf) (find) DROP EXECUTE + LIT< (wnf) FIND DROP EXECUTE ; : ROLL DUP NOT IF EXIT THEN diff --git a/blk/432 b/blk/432 index f3883ca..4e7bad7 100644 --- a/blk/432 +++ b/blk/432 @@ -1,7 +1,7 @@ : INTERPRET BEGIN WORD DUP C@ EOT? IF DROP EXIT THEN - (find) NOT IF (parse) ELSE EXECUTE THEN + FIND NOT IF (parse) ELSE EXECUTE THEN CTy?vbvyNdW)+t@~FFXD(kH@B!n$bF_um91(d-vLJ1h z%GCql&`oxO|J@OGuQ?`w!IpG~`_z_3P_>|614$oc>x>SEdOaZPChRm)#Ok9{Oa;Y) z-aa>er^NT6{yq&9{g^oP_Y%Vd8FF$;-Ilhcl=_}*L0^AwUkk7%Cnq>L!5PdKqp1G6 z98Ia@O|Sc+A;??{4Sey+ITULPXwV!_HNZhnw^Sw7oQWt{tdgE-Y9DrSI?~?spq8tW364J&v`;8Zpb$`bK;>W}dIusmxG=@B~)Fsbh zF6h0<^6oCo$&<*Z+}#$sUmV?`dYM3KaiK&hWKG3NW@s2))pt{+VyY}y@Er`a2Kx~EY(n*VMaC(avva4{=!S% zgX%r}+EMv}H}Cn-!{oQUb;q3Y3;u~Wb+nF_Go@msnl4sbh2^^YbMFc!Xe6H-_2Xr` zCP%6#v&B)wP!I3&U1)Hh3BV#KXcfMjB*6z5N-w5t4zUPq+T+w#*(Kkca-B`%Tgb(~ zg>uur6=e*cEy?CvkSm<3oO}#>_!5%I-YuUHf5t%ZM?NN#3blxeEkZD!_C@EEA#sO& zZ~O_=UT2qhpI(qS|GEBceE&f|+{o+HDl_LNUu;i+QxwevpXd}&2q|{?Zt4}-Ld;l| z1ESSka1#{^IeS)U;*=@dCtvea$PpfU{2hJ^Dnl8X7bfC_6pMwXBLAU3B<1-l{{4-I zSVaN&edy{#z2;BAOH(uB=H%3i=DDd0ljA@V2NV0y0fMs$33PKe=0$e}?x2H(d^NEj z7SU1y>hAabtBkPInK0ld`j`GBJk+V8Vkjc*r~1E;cE^FVIGph!giN@N_+;`b4iahx z8V!_DJoCQ56X|0}^&<62jN>}%R`v(TlOCWsW@n#Lbq_r`-ig<(D9;8gI78qhIX9&E zTY=W6oawBkql=P<3(`bsxHv%;-8IfUP*8KO`Jcdh6 z=)&o=0n}`iToYb_B{8*J2n7>5QFk6b-x9L3L=A0cU19)h|3g6l$rL<=Y1jIFgQ`LI%_-|> z@+kJJ4Olz>G^*QX8fdxw0{Z!m5eS;#fEarE^-hO>*&r`1C=V2hy^kZ%=%%X*Ee|i) z_mOWu3)=KmmQqcuD>bdHlstk;)X7H#@v^aOB$a8;J4OIOnJzX{L4XG*ui`42*okyMEGR776& zkb6|qFR`Zc@FxUXzF5tchsxP%4cvMUj`6Ds4RRZeYYux|J#vxamehkwU;-PQ+H2}Z z*bd`-GxU@+&7I)`2XvjLR;P#|3AaL&b_#u+?Iz(09}MsJQ7Lrz2>tm8bbc}XxRVA@ zL{a!J!_n?%1LJ-rJP-e%b}Xd_${jJRge?&lqbh>PdpnGU`tjKL$@aa-y~4i=4>rhR zGlSn)41F3*z?s>Lvv5sIKxV35AA4c;`BH^^_x}xV87N)E=1#%}Hv9vPY?g-nI0BL| zFDSHP#9%0fFw@i{bvIGkys)4rpdEU&en#+USnzZJn~rvljys1o%LGIbZwXv1yDPYk zlSYL{t~VkT_>|J0J1opk2xDR|;i{o!5J4xH{6IVDiHnt*EmX3GaIAu|w&XYb2U_Fb z2wp3DB413v5`qlp)QNPysNo@rEkn`Sv79Pa^M$Y=+g5GzNB{%660%@a#VDveB5eFa zw}`l~C*o_kbZ8>toJbOiEO#(k7KHQWiyQNRuWNDXJ>Tx(K^W z>e1w3RUVFXc}dX?+N~y7)y=0Sm$d2j;CDj){_c^UZg$iuPd#0%F-W0)CE?m}>^Ksx zKPqt8)7AYPiJIoL)SQ-@!A!0Z=GSnYkf28>Vz^yTf3aqj)R|Xxj25Q z^4j^qpi|a)Koih$W*y2bFvEWziUCgtYSIQh*X}cE`}dc3xq}9=SyUQv z2}RAY*gG_WQ1!i1xlk&T7OZ!*ea~Ifrk%@ZU0mgF3!k`J_AFQrv_>_l-LW2P%P*bq zn$%lJr%Gu*g8!Rlke4{2v#CNRWoFY2Xz1HshF`^c*Bd*S)b0Z9%?$Amymlr3T{-I$ zZ}HF*Tvq7`o*m4eg}FdQ)&RnffRsm?|X&vzHiz&tNz^j*!SYg zWq9t*=Zd9NuGB0&mpz-lWfW*M(?1r#V|y+~OQ+MhF<>ZZ9ra(XUiTYBB7%!%b|B6d zcaTaKN;V5DlBjq++KQO>&#LR9g1_=!^lP|R@h_|A@!53PdXxIIXNsryVeIE2W`B?T z^7^R|u0Qh&g-v)wTo@6CamC*_s}|%N_Pfy+V7)5lt)!lHT(^Fre;t2+uOF=r=sYTt zJz`WRn`V$-P70}v6uW&JdXYAP8MAm;&c2&AV3_T<*+Y}3-hzGd*G}1f#$z(j7BHze z)XM~704Hpi%hn97?*|$j1J>0*Q}rpjC;@*Ep+41z12MWXb7{gT&%9ww&Ri}}5Z_3| z4k7@Cvq3S0xtH^Tr%0b8z-*=zYod4HDMn?_hk+Hr*lCZ2=*Rl!fjB+YxucRtAzRSD zf^5qPS(MKC03m}O1D`@!0g>=9Fcon{aki4d7gC*&`XFsX9_!+`8VzzJ-y~)>yZT(J zEkts%9nUSRuLeyz$Kd399!gm61)EPy0Fpr(QEvn{bp9a1;r+6(1 zE1}#A4qLmy$OtQk1KVN_>GBY|!A@($!^Xum=ts0DS&O;Upmx~K(O-8b(SyD-gG1x! zNLwH(?M9F&gXtldZH@k6y&gJNT?#Q`TP~C*r&~jkJC;I1xf+^P8KIDWuhJTU{Ay@f zT?%oDn8En;XTi6I15NNWkRFN2Zl3|%mqFxQNhUC^(03SdmnNpm=UW+ZY?XVq1Na{{w$gW2v4)4259dKoF) z4%OEi!wo&{T zjCjhAN#TvqQYfxgythMf`nC0CeH6US^%@Q^Cer!rN#2%wAx5!RHZZ)|OtBP!JP0TT zWp5vWhwB@L0|uRZ9oBZ4nogN^d2Nblfgr6@kM@3X;7%ApceT5)u^$;7C z;}^=S!O4I#JV#&f2($X7Luiq05|#AExxNqMme)`i5-o7=7$2HjX2Fo39lvYMJd;S zUhrI%JuGSQ(OdX`tCf;kk6_$XP3jC{P2tQ-~5k$N2`7XP@CyjGPxMd z1AO4NS5ldrhC>{q#M#-ooXM3k*{~GbUTyJc5DDFEFlo$%EVy4XZTwsK4uE2_=rt@V zW>J(Q#n3b;UMoj$zISjalTFvtqJH1|tHwR~Xm4K1#~SIUP;ljv_?HPGnXt6Ij5d!2 M>1{T%zG&?F7Y6!0f&c&j