From 7501c776bcf9903afb03f3a8e496a955085c1915 Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Tue, 6 Sep 2016 12:53:02 -0700 Subject: [PATCH 1/3] Stash. --- arvo/jael.hoon | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arvo/jael.hoon b/arvo/jael.hoon index defa88caf..3420f7ed6 100644 --- a/arvo/jael.hoon +++ b/arvo/jael.hoon @@ -154,7 +154,9 @@ :: $line =* ryt `jael-right`[%entry [[(shaf %hand r.tac) q.tac r.tac] ~ ~]] - !! + =< abet + =< abet + (give:(unto:(from p.tac) our) `(nap jael-right)`[ryt ~ ~]) == :: ++ from From 0dcc591e0e3c5787f8d5eaf1bee689756f205d5a Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Tue, 6 Sep 2016 13:29:09 -0700 Subject: [PATCH 2/3] New @p printing had gotten lost. --- arvo/hoon.hoon | 44 +++++++++++++++++--------------------------- arvo/jael.hoon | 2 ++ 2 files changed, 19 insertions(+), 27 deletions(-) diff --git a/arvo/hoon.hoon b/arvo/hoon.hoon index 490279a0e..a27202408 100644 --- a/arvo/hoon.hoon +++ b/arvo/hoon.hoon @@ -4698,37 +4698,27 @@ == :: $p - =+ dyx=(met 3 q.p.lot) + =+ sxz=(feen:ob q.p.lot) + =+ dyx=(met 3 sxz) :- '~' ?: (lte dyx 1) - (weld (trip (tod:po q.p.lot)) rep) - ?: =(2 dyx) - ;: weld - (trip (tos:po (end 3 1 q.p.lot))) - (trip (tod:po (rsh 3 1 q.p.lot))) - rep - == - =+ [dyz=(met 5 q.p.lot) fin=| dub=&] + (weld (trip (tod:po sxz)) rep) + =+ dyy=(met 4 sxz) + =+ imp=*@ |- ^- tape - ?: =(0 dyz) + ?: =(imp dyy) rep - %= $ - fin & - dub !dub - dyz (dec dyz) - q.p.lot (rsh 5 1 q.p.lot) - rep - =+ syb=(wren:un (end 5 1 q.p.lot)) - =+ cog=~(zig mu [(rsh 4 1 syb) (end 4 1 syb)]) - ;: weld - (trip (tos:po (end 3 1 p.cog))) - (trip (tod:po (rsh 3 1 p.cog))) - `tape`['-' ~] - (trip (tos:po (end 3 1 q.cog))) - (trip (tod:po (rsh 3 1 q.cog))) - `tape`?.(fin ~ ['-' ?.(dub ~ ['-' ~])]) - rep - == + %= $ + sxz (rsh 4 1 sxz) + imp +(imp) + rep + =+ log=(end 4 1 sxz) + ;: weld + (trip (tos:po (rsh 3 1 log))) + (trip (tod:po (end 3 1 log))) + ?:(=((mod imp 4) 0) ?:(=(imp 0) "" "--") "-") + rep + == == :: $r diff --git a/arvo/jael.hoon b/arvo/jael.hoon index 3420f7ed6..012adba0a 100644 --- a/arvo/jael.hoon +++ b/arvo/jael.hoon @@ -157,6 +157,8 @@ =< abet =< abet (give:(unto:(from p.tac) our) `(nap jael-right)`[ryt ~ ~]) + :: + $ == :: ++ from From 1286d81a52d847ad0f81fa2b5d9fcbbe1effad47 Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Wed, 7 Sep 2016 10:33:42 -0700 Subject: [PATCH 3/3] Various improvements. --- arvo/jael.hoon | 61 ++++++++++++++++++++++++++++++++++++++++++++++++-- arvo/zuse.hoon | 1 + 2 files changed, 60 insertions(+), 2 deletions(-) diff --git a/arvo/jael.hoon b/arvo/jael.hoon index 012adba0a..1394c7235 100644 --- a/arvo/jael.hoon +++ b/arvo/jael.hoon @@ -41,10 +41,16 @@ vew/(set duct) :: watchers == :: ++ jael-friend :: relationship - $: luf/(unit life) :: life known + $: luf/(unit life) :: life as known to lab/(nap jael-right) :: promises to vow/(set duct) :: watchers == :: +++ jael-inference :: learning result + $% {$hard p/ship} :: rough update to + {$meet p/ship} :: first contact with + {$soft p/ship} :: soft update to + {$sign p/ship q/gree} :: return signature + == ++ jael-right :: urbit commitment $% {$block p/pile} :: address block {$email p/(set @ta)} :: email addresses @@ -158,9 +164,50 @@ =< abet (give:(unto:(from p.tac) our) `(nap jael-right)`[ryt ~ ~]) :: - $ + $meet + =^ fur pub.urb.nav.lex (~(meet da pub.urb.nav.lex) p.tac) + [~ lex] + :: + $over + $(our p.tac, tac q.tac) + :: + $pall + =< abet + =< abet + (pall:(unto:(from our) p.tac) q.tac) == :: +++ meld + |= {new/gree old/gree} + =+ + =< work + |% ++ abet + + ++ work + =+ wen=(~(tap by new)) + |- ^- {(list jael-inference + ++ + =+ wen=(~(tap by new)) + |- ^- {gree gree} + ?~ wen [~ old] + + =+ mor=$(wen t.wen) + + + +++ da :: pedigree core + |_ {via/ship ped/gree} + ++ meet + |= new/gree + =+ wen=(~(tap by new)) + |- ^- {(list jael-inference) gree} + ?~ wen [~ ped] + =+ mor=$(wen t.wen) + + + + -- +:: ++ from |= rex/ship =+ :* nex=*(list move) @@ -183,6 +230,16 @@ |= lab/(nap jael-right) ^+ +> !! + :: + ++ pall + |= lyf/life + ?> |(?=($~ luf) =(u.luf lyf) =( + +>(luf `lyf) + %= +> + luf + ?~ luf `lyf + ?: =(u.luf + == -- -- -- diff --git a/arvo/zuse.hoon b/arvo/zuse.hoon index 0fab1a09f..c1ecc4488 100644 --- a/arvo/zuse.hoon +++ b/arvo/zuse.hoon @@ -3630,6 +3630,7 @@ ++ deod {myn/mind syg/@uw} :: signature ++ lama :: $: dob/? :: & clean, | dirty + dad/ship :: parent exp/@da :: expiration date own/(map chip (pair @ta @t)) :: identity strings pub/pass :: public key