From 3615944ffaec4990155bb61a2d034029295ef07c Mon Sep 17 00:00:00 2001 From: Virgil Dupras Date: Sun, 8 Nov 2020 17:22:54 -0500 Subject: [PATCH] Remove MIN and MAX from core It isn't used in there anymore. Moved it to VE, the only place where it's used. --- blk/126 | 2 ++ blk/354 | 2 -- cvm/forth.bin | Bin 5170 -> 5130 bytes doc/dict.txt | 2 -- 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/blk/126 b/blk/126 index e27451b..5f4aa91 100644 --- a/blk/126 +++ b/blk/126 @@ -1,5 +1,7 @@ CREATE CMD 2 C, '$' C, 0 C, CREATE PREVPOS 0 , CREATE PREVBLK 0 , +: MIN ( n n - n ) 2DUP > IF SWAP THEN DROP ; +: MAX ( n n - n ) 2DUP < IF SWAP THEN DROP ; : acc@ ACC @ 1 MAX ; : num ACC @ SWAP _pdacc IF ACC ! ELSE DROP THEN ; : nspcs ( n -- , spit n space ) 0 DO SPC LOOP ; diff --git a/blk/354 b/blk/354 index d9512de..90c2ace 100644 --- a/blk/354 +++ b/blk/354 @@ -3,8 +3,6 @@ : 0< 32767 > ; : >= < NOT ; : <= > NOT ; : 0>= 0< NOT ; : >< ( n l h -- f ) 2 PICK > ( n l f ) ROT> > AND ; : =><= 2 PICK >= ( n l f ) ROT> >= AND ; -: MIN ( n n - n ) 2DUP > IF SWAP THEN DROP ; -: MAX ( n n - n ) 2DUP < IF SWAP THEN DROP ; : NIP SWAP DROP ; : TUCK SWAP OVER ; : -^ SWAP - ; : C@+ ( a -- a+1 c ) DUP C@ SWAP 1+ SWAP ; diff --git a/cvm/forth.bin b/cvm/forth.bin index 271113f3f46cb0297d5051b6288040a9e6a66345..086d78c8f5e7a8e5a373c69cdf026117bfb083a1 100644 GIT binary patch delta 2308 zcmYjSdu&_f6+hp7_+G!R9Vcy?)oxwqoj%-FBvK7i>+9>37}t($_pxpyw=kYtg@7y;Ao*(ES{C?8buU~KHmHRvR+l~iRtu!{?Azx5`C}!m!)NOcwu4eG= z({^sDt8qG1b^@e|PO(gJ$`*^|T8MOEDK}O53vF1fXpVeE+x^g@D#ZjXs;gRtzGG9n z+Chr2$)r^+PQ}rny9>CxT*cdk@9c`BVba9M+ErLq$8#LdrlhMZ6=AABe>-2P_#j@F zS$$i!Q;*ZY%+#r~g9-A90$HW_7GMIhftCQr}S2kT@A z!Hc4T%;) ztRciM`j_}fS%Z%+fXwwK^_ix)h*Lv?Pxwa6UQ+wyJEq-UFw07u`b`qzPbTB2)@9h= zBkFRmzu)}Qv`M8eO*!fB@-Jv>bP!lA$*28&HQtr5J1E%o5=is6ODO43`AB}pUUV&s z_>KmI{hsh>3_@mDlNxa2VY{F`L9^=J-IBcJAFM2@v+4zZRvA{h;aVCkgV&7WKz(}d z^rM3*G@xMKg5O*vpRMJ?KrI!pNg+n^NVYPTwTt<7v~aI0b>z9gj?jmI>v(|M@pr#m z4-_^?80X5RYAsu;^}EK>cw0t-2~m(cgLCs!L7PZZ5Z5j~&=UdbS;eON0Br))BF)im z7*ZU8{RQFR?b>bYg`E@Z7Wd$p1I<_;r_ti!>iwGlz!8Xn@f$(c`al%c4PtwjsLYAW zK^7#$e7Ebt^9r{*AoH9Z9UDi@n(z{oqN150PyOBF+V;f)fCF4`Lb1$l{8c zp?`C^<3HMplb3@{x)$UpoXE*2ns3u5YLi|hmjVb%vKi_g=8Ny$8Gx}9*ZG35L_Neb z-bdf?-Qtv2wO;yXoc3qnr(2wt--hlP8P;ryQm6PJw5stFr(MUo+yO$EM7Kk?k@86k z2iR8zE*f+@L~=5`VIwO^e-n4|vt=kv>$7kHv?q zMCex7CY?S-jW@2!C2O1Srix4RWBHD?tKewA1{EH&Y??MUYbyZH=h6aGa;#cQBd=?~ zE9xeG5Vz6`&%RXB&!ae-4xl}jn3B6ATedQOD!1rUOV7|-aT+Vt@|E#QzBWmIu<_@S zu1zBbZ06_$rb3$Fp+L&a!|R$QUy2M1NB%j|-F*#R_wGIu^w|jG!esqlemVJr=+NY~ zU@t|Exv;VN7;z7a<*c)P5iDaeD&p0MC#pmtY5`oPQ-jWjEdA9;hQ7X|-5v+uyc12A z#tKY}^5v+5(msps!@H-gDsu8%TY7#WY6I%cAjWU7`YOz;|KhQ9UU9yRrtMDd1=nr} zbu787mSNKhR{vK^IyL#oY&}`70v5g0hVQ`8G8o6BLBnY1 z;0vD_8j9j0#4;T+DKoMD`E~6IW}s8>TD=|eP#sj7}Rx52l zi)|n%4R$&ZqF><~CI$=UDM9 zH%Dl$M2GbeV>;GLmqCHi{cbjCH};BfaD!_1=S%I#s6km}UQNWB82NF^7poX{oM$g= z+47TER=EfbGEH^5nu6;^BAvJKY2nis(I`H>E46hC0(G|Aw61YtS-V`RrP}COu@AB< zij+^bC*~QFy8s+6)y9e&=@~@yvb(D|9s>?JFz191<$Ju!l@E=N74sH7Cq6W%V|O7t men);{BP~F|fsgl}2+-566-EO-NIZ6v{mJ}j^?>Z^==vUM^Wj4P delta 2242 zcmYjSduUr_6hGg65#_szgbxQiZ~_BYuCKBm3b$nVrhj z$$jcQ;<$WM-GJvOY7Ebt>LxKGH)`vYc1@@q`s(u7yP0n0)z;XyJMwK_^W15^FAo5_6M1@Q%K zMF~^)69-C%di>-PX$nqG?cFyf`*e>Okay`VkpUeBhYlX-Sw}kTVbOYMeBzPTgX2@J z2gaW`_{e~KT91iEd0LOOzo%cPD0wTiAf#wS_!wQT(iVi@MBf4pU5Yt*U7ugS&s8Q> zjgtE;)eNg-kwz;*5i$CDMtW<^c4JfqGEB=q>+iOKyv`^gYd7l04b ziQ4O0?e&fB2xnx`xLs7_%SK!4r)ofH#?g%tKcG8dl;Jy4ON#MbmY*A2T9%D46|?tc z^MgU4Aw`AQ@TPH{<|$yxwPs|eZ8i(r3=L?j!X#}cy>J@VcF^>?N z=@;>>G7ld=0h#ZsWSgc~z^PurCtM?D2dTC^W?BssW){WhGD(O(O~z53k(bSO5X9r| z>TPmcq*9X`{L1c1HX!m0Ox7?>=4lwXoziOWGjg}PGsrs|(qX~j&d6i#ReDLQ(qr-+ zcNp4d=(sv8YOtP>=iNQ|MfJG)nLDm*RoZZ7$yhdc&5(8PKR7kSaN**zP!}IfYjpNYs4Ym&)N{+K@QvwTLt+ z4r_frR2$;KfmI;ItT^dC>Kz5-TM)~rAdA1$82!eV$~~|iA+LI?WcoPDMLFWTdn-3= zjqPx`32k^%1jLMw33#V7H+0VIoYp}&^0$f8a@lvs^d8Nk5H*RLzH=J?!?gMS zwNB%cXcC?NPJfsl4&VU$ior#hI{n=`cM|iWOl{~qHmyR=nh(%jKUQFDItGg>A8f_{ z2-zxA4)7aOaNP2rhL4+~H&F3lPttIYy}<-}blbziQq3uks83VBeYm z`|~(m<#_TVhZ}zM{a47e>?Ak}dNl*ZQ672Q0?odTfJHj-th{zZJ{s8IY6lYP^YU0= zbGoFxu2}RIEGkAqo5gKh=qIjuCRHd#k(cRXh&Y*H^js~xGk3f7(>{h`8x#SM$_%!6 z8Do{J^+Uhh5^T7A0)5L63GH8kWEFPVU(E8<*!L6bs-wn34 znLefn_jfZ~ECd-HUjLWnnEXB1tC&975(*nkLq)8}cxZL!Xn!v2hyZHJo(gQhbK+m#CWN+_wmX7t=R&ut3O$X8Qxm~ z=hEnD4V~V|{Tu7;4dL^_G99udSzq5ZUHg~}X4~m`1RSL$3=qCxHW#EaBr!)~iex>{ zi%hC$uR;MWFlNbMr`v4a$BRTdm+)EO(+emRpWYl<= n l h -- f Push true if l <= n <= h CMP n1 n2 -- n Compare n1 and n2 and set n to -1, 0, or 1. n=0: a1=a2. n=1: a1>a2. n=-1: a1