From b4564cc237ef9b9dc3f7025836692e609f593873 Mon Sep 17 00:00:00 2001 From: Joseph Bryan Date: Thu, 8 Dec 2016 13:17:05 -0500 Subject: [PATCH 1/4] applies apt:in (set invariant) in ++set --- sys/hoon.hoon | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/hoon.hoon b/sys/hoon.hoon index 55463c5621..955b0ba9aa 100644 --- a/sys/hoon.hoon +++ b/sys/hoon.hoon @@ -1602,7 +1602,9 @@ ++ qeu |* a/mold :: queue $@($~ {n/a l/(qeu a) r/(qeu a)}) :: ++ set |* a/mold :: set - $@($~ {n/a l/(set a) r/(set a)}) :: + %+ cork (tree a) :: + |= b/(tree a) ^+ b :: + ?.(~(apt in b) ~ b) :: :: :::: 2p: serialization :: :: :: From d0e379d57271472ae8bc782bbe3327fb514b7126 Mon Sep 17 00:00:00 2001 From: Joseph Bryan Date: Thu, 8 Dec 2016 13:19:25 -0500 Subject: [PATCH 2/4] applies ept:by (map invariant) in ++map --- sys/hoon.hoon | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/hoon.hoon b/sys/hoon.hoon index 955b0ba9aa..72db17ec48 100644 --- a/sys/hoon.hoon +++ b/sys/hoon.hoon @@ -1598,7 +1598,9 @@ ++ jar |*({a/mold b/mold} (map a (list b))) :: map of lists ++ jug |*({a/mold b/mold} (map a (set b))) :: map of sets ++ map |* {a/mold b/mold} :: table - $@($~ {n/{p/a q/b} l/(map a b) r/(map a b)}) :: + %+ cork (tree (pair a b)) :: + |= c/(tree (pair a b)) ^+ c :: + ?.(~(ept by c) ~ c) :: ++ qeu |* a/mold :: queue $@($~ {n/a l/(qeu a) r/(qeu a)}) :: ++ set |* a/mold :: set From f240cf7c204106e2bbe19336a80583f8986cd395 Mon Sep 17 00:00:00 2001 From: Joseph Bryan Date: Thu, 8 Dec 2016 13:34:52 -0500 Subject: [PATCH 3/4] renames ept:by to apt:by --- sys/hoon.hoon | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/hoon.hoon b/sys/hoon.hoon index 72db17ec48..56804b4af8 100644 --- a/sys/hoon.hoon +++ b/sys/hoon.hoon @@ -1206,7 +1206,7 @@ $(a l.a, c (peg c 6)) $(a r.a, c (peg c 7)) :: - +- ept :: check correctness + +- apt :: check correctness =| {l/(unit) r/(unit)} |- ^- ? ?~ a & @@ -1600,7 +1600,7 @@ ++ map |* {a/mold b/mold} :: table %+ cork (tree (pair a b)) :: |= c/(tree (pair a b)) ^+ c :: - ?.(~(ept by c) ~ c) :: + ?.(~(apt by c) ~ c) :: ++ qeu |* a/mold :: queue $@($~ {n/a l/(qeu a) r/(qeu a)}) :: ++ set |* a/mold :: set From c05c19403233c0d5f33ccf6b38362f38cdf343f5 Mon Sep 17 00:00:00 2001 From: Joseph Bryan Date: Thu, 8 Dec 2016 13:36:20 -0500 Subject: [PATCH 4/4] simplies ++qeu --- sys/hoon.hoon | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/hoon.hoon b/sys/hoon.hoon index 56804b4af8..3ebd9aaa77 100644 --- a/sys/hoon.hoon +++ b/sys/hoon.hoon @@ -1601,8 +1601,7 @@ %+ cork (tree (pair a b)) :: |= c/(tree (pair a b)) ^+ c :: ?.(~(apt by c) ~ c) :: -++ qeu |* a/mold :: queue - $@($~ {n/a l/(qeu a) r/(qeu a)}) :: +++ qeu |*(a/mold (tree a)) :: queue ++ set |* a/mold :: set %+ cork (tree a) :: |= b/(tree a) ^+ b ::