From 7a38c3e2287ebb4c35a07b1f18941850303c29d6 Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Fri, 22 May 2020 14:17:38 -0400
Subject: [PATCH] Add word TUCK

---
 blk/046        |   4 ++--
 blk/107        |   2 +-
 blk/108        |   2 +-
 blk/125        |   2 +-
 blk/144        |   2 +-
 blk/354        |   5 +++--
 blk/364        |   1 -
 blk/369        |   2 +-
 blk/371        |   2 +-
 emul/forth.bin | Bin 5923 -> 5929 bytes
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/blk/046 b/blk/046
index e9b66cf..8903d97 100644
--- a/blk/046
+++ b/blk/046
@@ -7,10 +7,10 @@ NIP         a b -- b
 OVER        a b -- a b a
 ROT         a b c -- b c a
 SWAP        a b -- b a
+TUCK        a b -- b a b
 2DROP       a a --
 2DUP        a b -- a b a b
 2OVER       a b c d -- a b c d a b
 2SWAP       a b c d -- c d a b
 'S          Returns current stack pointer, not counting the
-            push it's making right now.
-                                                        (cont.)
+            push it's making right now.                 (cont.)
diff --git a/blk/107 b/blk/107
index a099d36..5b1d157 100644
--- a/blk/107
+++ b/blk/107
@@ -3,7 +3,7 @@
     BEGIN
         C@+ ROT ( a2+1 c2 a1 ) C@+ ROT ( a2+1 a1+1 c1 c2 )
         = NOT IF DROP FBUF THEN
-        SWAP OVER C@ 0xd = ( a1 a2 f1 )
+        TUCK C@ 0xd = ( a1 a2 f1 )
         OVER BLK) = OR ( a1 a2 f1|f2 )
     UNTIL
     DUP BLK) < IF BLK( - FBUF + -^ EDPOS ! THEN
diff --git a/blk/108 b/blk/108
index d012920..c6b50f7 100644
--- a/blk/108
+++ b/blk/108
@@ -4,7 +4,7 @@
     EDPOS @ 64 MOD 63 -^ ;
 : _I
     IBUF _type _rbufsz IBUF _blen 2DUP > IF
-        SWAP OVER - ( ilen chars-to-move )
+        TUCK - ( ilen chars-to-move )
         SWAP EDPOS @ _cpos 2DUP + ( ctm ilen a a+ilen )
         3 PICK MOVE- ( ctm ilen )
         NIP ( ilen )
diff --git a/blk/125 b/blk/125
index 04605b9..645b2b9 100644
--- a/blk/125
+++ b/blk/125
@@ -9,7 +9,7 @@
     < IF  ( under limit, do nothing )
         NIP          ( a )
     ELSE ( o a )
-        SWAP OVER @  ( a o n )
+        TUCK @       ( a o n )
         -^           ( a n-o )
         OVER !       ( a )
     THEN
diff --git a/blk/144 b/blk/144
index 87dfb5c..d633ed7 100644
--- a/blk/144
+++ b/blk/144
@@ -3,7 +3,7 @@
 : AMOVE
     ( u ) 0 DO
         SWAP DUP I + A@   ( dst src x )
-        ROT SWAP OVER I + ( src dst x dst )
+        ROT TUCK I +      ( src dst x dst )
         A!                ( src dst )
     LOOP
     2DROP
diff --git a/blk/354 b/blk/354
index 99faa9c..b08e2fc 100644
--- a/blk/354
+++ b/blk/354
@@ -6,7 +6,8 @@
 : =><= 2 PICK >= ( n l f ) ROT 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 ;
 : C@+ ( a -- a+1 c ) DUP C@ SWAP 1+ SWAP ;
-: C!+ ( c a -- a+1 ) SWAP OVER C! 1+ ;
+: C!+ ( c a -- a+1 ) TUCK C! 1+ ;
 : C@- ( a -- a-1 c ) DUP C@ SWAP 1- SWAP ;
-: C!- ( c a -- a-1 ) SWAP OVER C! 1- ;
+: C!- ( c a -- a-1 ) TUCK C! 1- ;
diff --git a/blk/364 b/blk/364
index a757bf8..865da53 100644
--- a/blk/364
+++ b/blk/364
@@ -12,4 +12,3 @@
     IF OVER C@ OR
     ELSE 0xff XOR OVER C@ AND THEN ( addr flg )
     SWAP C! ;
-: NIP SWAP DROP ;
diff --git a/blk/369 b/blk/369
index f6f6872..70e7d75 100644
--- a/blk/369
+++ b/blk/369
@@ -5,7 +5,7 @@
     CURRENT @ 1-
     DUP C@ 128 OR SWAP C! ;
 : IMMED? 1- C@ 0x80 AND ;
-: +! SWAP OVER @ + SWAP ! ;
+: +! TUCK @ + SWAP ! ;
 : -^ SWAP - ;
 : / /MOD NIP ;
 : MOD /MOD DROP ;
diff --git a/blk/371 b/blk/371
index 0523223..7180b9b 100644
--- a/blk/371
+++ b/blk/371
@@ -4,7 +4,7 @@
         ROT C!+ ( a1+1 a2+1 )
     LOOP 2DROP ;
 : MOVE- ( a1 a2 u -- )
-    SWAP OVER + 1- ( a1 u a2+u-1 )
+    TUCK + 1- ( a1 u a2+u-1 )
     ROT 2 PICK + 1- ( u a2+u-1 a1+u-1 )
     ROT ( u ) 0 DO ( a2 a1 )
         C@- ( a2 a1-1 x )
diff --git a/emul/forth.bin b/emul/forth.bin
index 5e93703422c4fe1cbc99b52087983a76d31b00d5..ed9b81420c95d18e0f4a8f4ca456d7b36d1becc6 100644
GIT binary patch
delta 2167
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
SvgM_(>W~*cAU*zPVdMYfE$$xx

delta 2260
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
b_oCZ4?%JSo)Bc=xm+uO~TVy8wjBfZBjf?Q?