From e35ecea25ec6364e8780548513cc4dd038dfddc1 Mon Sep 17 00:00:00 2001
From: Simon Forman <sforman@hushmail.com>
Date: Tue, 14 Feb 2023 07:55:09 -0800
Subject: [PATCH] Unify the various defs.txt files...

Work in progress.  THis is broken now.
---
 implementations/C/defs.txt | 11 ++++++++---
 implementations/defs.txt   | 17 +++++++++++++++--
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/implementations/C/defs.txt b/implementations/C/defs.txt
index 373bf0b..8767ffb 100644
--- a/implementations/C/defs.txt
+++ b/implementations/C/defs.txt
@@ -24,8 +24,10 @@ b [i] dip i
 binary unary popd
 ccccons ccons ccons
 ccons cons cons
+clear [] swaack pop
 cleave fork popdd
 clop cleave popdd
+cmp [[>] swap] dipd [ifte] ccons [=] swons ifte
 codi cons dip
 codireco codi reco
 dinfrirst dip infrst
@@ -39,6 +41,7 @@ dupdd [dup] dipd
 dupdip dupd dip
 dupdipd dup dipd
 enstacken stack [clear] dip
+first uncons pop
 flatten <{} [concat] step
 fork [i] app2
 fourth rest third
@@ -52,6 +55,7 @@ ii [dip] dupdip i
 infra swons swaack [i] dip swaack
 infrst infra first
 make_generator [codireco] ccons
+mod %
 neg 0 swap -
 not [true] [false] branch
 nulco [nullary] cons
@@ -71,6 +75,7 @@ quoted [unit] dip
 range [0 <=] [-- dup] anamorphism
 range_to_zero unit [down_to_zero] infra
 reco rest cons
+rest uncons popd
 reverse <{} shunt
 roll> swap swapd
 roll< swapd swap
@@ -121,6 +126,6 @@ _mape popd reverse
 _map0 [_map1] dipd _map2
 _map1 stackd shift
 _map2 [infrst] cons dipd roll< swons
-xor [not not] [not] branch
-and [pop false] [not not] branch
-or [not not] [pop true] branch
\ No newline at end of file
+_\/_ [not not] [not] branch
+/\ [pop false] [not not] branch
+\/ [not not] [pop true] branch
\ No newline at end of file
diff --git a/implementations/defs.txt b/implementations/defs.txt
index 65cc47c..8767ffb 100644
--- a/implementations/defs.txt
+++ b/implementations/defs.txt
@@ -1,3 +1,9 @@
+eq [false] [true] [false] cmp
+gt [true] [false] [false] cmp
+lt [false] [false] [true] cmp
+neq [true] [false] [true] cmp
+le [false] [true] [true] cmp
+ge [true] [true] [false] cmp
 -- 1 -
 ? dup bool
 && nulco [nullary [false]] dip branch
@@ -26,7 +32,8 @@ codi cons dip
 codireco codi reco
 dinfrirst dip infrst
 dipd [dip] codi
-disenstacken ? [uncons ?] loop pop
+disenstacken swaack pop
+divmod [/] [%] clop
 down_to_zero [0 >] [dup --] while
 drop [rest] times
 dupd [dup] dip
@@ -52,6 +59,7 @@ mod %
 neg 0 swap -
 not [true] [false] branch
 nulco [nullary] cons
+null [] concat bool not
 nullary [stack] dinfrirst
 of swap at
 pam [i] map
@@ -64,7 +72,7 @@ popopd [popop] dip
 popopdd [popop] dipd
 product 1 swap [*] step
 quoted [unit] dip
-range [0 <=] [1 - dup] anamorphism
+range [0 <=] [-- dup] anamorphism
 range_to_zero unit [down_to_zero] infra
 reco rest cons
 rest uncons popd
@@ -79,6 +87,7 @@ second rest first
 shift uncons [swons] dip
 shunt [swons] step
 size [pop ++] step_zero
+small dup null [rest null] [pop true] branch
 spiral_next [[[abs] ii <=] [[<>] [pop !-] ||] &&] [[!-] [[++]] [[--]] ifte dip] [[pop !-] [--] [++] ifte] ifte
 split_at [drop] [take] clop
 split_list [take reverse] [drop] clop
@@ -99,6 +108,7 @@ unary nullary popd
 uncons [first] [rest] cleave
 unit [] cons
 unquoted [i] dip
+unstack [[] swaack] dip swoncat swaack pop
 unswons uncons swap
 while swap nulco dupdipd concat loop
 x dup i
@@ -116,3 +126,6 @@ _mape popd reverse
 _map0 [_map1] dipd _map2
 _map1 stackd shift
 _map2 [infrst] cons dipd roll< swons
+_\/_ [not not] [not] branch
+/\ [pop false] [not not] branch
+\/ [not not] [pop true] branch
\ No newline at end of file