From 935baa3c8369305f2c442288de98e31fa98e1884 Mon Sep 17 00:00:00 2001 From: Elliot Glaysher Date: Tue, 11 Dec 2018 13:39:39 -0800 Subject: [PATCH] Explicit resolution, less ^ --- app/dojo.hoon | 12 ++++++------ app/hall.hoon | 42 +++++++++++++++++++++--------------------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/app/dojo.hoon b/app/dojo.hoon index d8f7a3d9a2..3bd35bce5a 100644 --- a/app/dojo.hoon +++ b/app/dojo.hoon @@ -1269,10 +1269,10 @@ ++ dy-edit :: handle edit |= cal/sole-change ^+ +>+> - =^ dat say (~(transceive ^sole say) cal) + =^ dat say (~(transceive sole say) cal) ?: |(?=(^ per) ?=(^ pux) ?=(~ pro)) ~& %dy-edit-busy - =^ lic say (~(transmit ^sole say) dat) + =^ lic say (~(transmit sole say) dat) (dy-diff %mor [%det lic] [%bel ~] ~) (dy-slam(per `dat) /edit u.pro !>((tufa buf.say))) :: @@ -1541,12 +1541,12 @@ ++ he-errd :: reject update |= {rev/(unit sole-edit) err/@u} ^+ +> =+ red=(fall rev [%nop ~]) :: required for error location sync - =^ lic say (~(transmit ^sole say) red) + =^ lic say (~(transmit sole say) red) (he-diff %mor [%det lic] [%err err] ~) :: ++ he-pone :: clear prompt ^+ . - =^ cal say (~(transmit ^sole say) [%set ~]) + =^ cal say (~(transmit sole say) [%set ~]) (he-diff %mor [%det cal] ~) :: ++ he-prow :: where we are @@ -1719,7 +1719,7 @@ ^+ +> :: ~& [%his-clock ler.cal] :: ~& [%our-clock ven.say] - =^ dat say (~(transceive ^sole say) cal) + =^ dat say (~(transceive sole say) cal) ?. ?& ?=($del -.dat) =(+(p.dat) (lent buf.say)) == @@ -1753,7 +1753,7 @@ ?~ p.doy (he-errd ~ (lent txt)) =+ old=(weld ?~(buf "> " " ") (tufa buf.say)) - =^ cal say (~(transmit ^sole say) [%set ~]) + =^ cal say (~(transmit sole say) [%set ~]) =. +>.$ (he-diff %mor txt+old nex+~ det+cal ~) ?- -.u.p.doy %& (he-plan(buf ~) p.u.p.doy) diff --git a/app/hall.hoon b/app/hall.hoon index fda24c70dd..03009fa5b6 100644 --- a/app/hall.hoon +++ b/app/hall.hoon @@ -116,7 +116,7 @@ :: # :: functional cores and arms. :: -~% %hall-door ..^is ~ +~% %hall-door ..is ~ |_ {bol/bowl:gall $1 state} :: :: # %transition @@ -359,7 +359,7 @@ (ta-action [%create nom des typ]) %- ta-deltas :: if needed, subscribe to our parent's /burden. - =+ sen=(above [our now our]:bol) + =+ sen=(above:hall-lib [our now our]:bol) ?: ?| !=(%czar (clan:title sen)) =(sen our.bol) =(%pawn (clan:title our.bol)) @@ -769,7 +769,7 @@ ~/ %hall-ta-observe |= who/ship ^+ +> - ?. =(our.bol (above our.bol now.bol who)) + ?. =(our.bol (above:hall-lib our.bol now.bol who)) ~&([%not-our-bearer who] +>) (ta-delta %observe who) :: @@ -1144,7 +1144,7 @@ :: ignore if it won't result in change. ?. ?| &(?=($remove -.dif.rum) ?=(^ old)) ?=(~ old) - !=(u.old (change-config u.old dif.rum)) + !=(u.old (change-config:hall-lib u.old dif.rum)) == +>.$ :: full changes to us need to get split up. @@ -1164,7 +1164,7 @@ :: ignore if it won't result in change. ?. ?| &(?=($remove -.dif.rum) ?=(^ old)) ?=(~ old) - !=(u.old (change-status u.old dif.rum)) + !=(u.old (change-status:hall-lib u.old dif.rum)) == +>.$ (so-delta-our rum) @@ -1250,7 +1250,7 @@ :: in audience, replace above with us. ::TODO this really should be done by the sender. =. aud.t - =+ dem=[(above [our now our]:bol) nom] + =+ dem=[(above:hall-lib [our now our]:bol) nom] ?. (~(has in aud.t) dem) aud.t =+ (~(del in aud.t) dem) (~(put in -) so-cir) @@ -1258,7 +1258,7 @@ ?: &(?=(^ num) =(t (snag u.num grams))) ~ ::TODO this really should have sent us the message :: src as well but that's not an easy fix. - `[%story nom %gram [(above [our now our]:bol) nom] t] + `[%story nom %gram [(above:hall-lib [our now our]:bol) nom] t] == :: inherited flag %_(self deltas [[%story nom %inherited &] deltas]) @@ -1283,7 +1283,7 @@ ?| !(~(has by locals) who) :: =+ old=(~(got by locals) who) - =+ new=(change-status - dif) + =+ new=(change-status:hall-lib - dif) ?& !=(old new) :: ?= ~ @@ -1939,7 +1939,7 @@ ~/ %hall-da-change-nick |= {who/ship nic/nick} ^+ +> - +>(nicks (change-nicks nicks who nic)) + +>(nicks (change-nicks:hall-lib nicks who nic)) :: :: # :: # %stories @@ -2125,7 +2125,7 @@ =. +> %- sa-emil (sa-config-effects shape dif.det) - +>(shape (change-config shape dif.det)) + +>(shape (change-config:hall-lib shape dif.det)) :: $status %_ +> @@ -2133,7 +2133,7 @@ ?: ?=($remove -.dif.det) (~(del by locals) who.det) %+ ~(put by locals) who.det - %+ change-status + %+ change-status:hall-lib (fall (~(get by locals) who.det) *status) dif.det == @@ -2196,7 +2196,7 @@ ?: ?=($remove -.dif.det) +>(mirrors (~(del by mirrors) cir.det)) =/ new/config - %+ change-config + %+ change-config:hall-lib (fall (~(get by mirrors) cir.det) *config) dif.det +>.$(mirrors (~(put by mirrors) cir.det new)) @@ -2208,7 +2208,7 @@ =+ ole=(fall (~(get by remotes) cir.det) *group) ?: ?=($remove -.dif.det) (~(del by ole) who.det) =+ old=(fall (~(get by ole) who.det) *status) - (~(put by ole) who.det (change-status old dif.det)) + (~(put by ole) who.det (change-status:hall-lib old dif.det)) == == :: @@ -2370,7 +2370,7 @@ (welp /circle t.t.t.wir) :: {$burden *} - :- (above [our now our]:bol) + :- (above:hall-lib [our now our]:bol) /burden/(scot %p our.bol) :: {$report @ *} @@ -2730,7 +2730,7 @@ :: $report :: only send changes we didn't get from above. - ?: =(src.bol (above [our now our]:bol)) ~ + ?: =(src.bol (above:hall-lib [our now our]:bol)) ~ :: only send story reports about grams and status. ?. ?=($story -.det) ~ ?. ?=(?($gram $status) -.det.det) ~ @@ -2739,7 +2739,7 @@ ?. inherited.soy ~ :: only burden channels for now. ?. =(%channel sec.con.shape.soy) ~ - `[%burden nom.det (dedicate (above [our now our]:bol) nom.det det.det)] + `[%burden nom.det (dedicate (above:hall-lib [our now our]:bol) nom.det det.det)] :: $peers ?. ?=($story -.det) ~ @@ -2825,7 +2825,7 @@ ?~ pax qer ::TODO can probably do this a bit better... ?+ i.pax - qer(ran (path-to-range pax)) + qer(ran (path-to-range:hall-lib pax)) :: circle-data %_ $ pax t.pax wat.qer (~(put in wat.qer) i.pax) @@ -2862,7 +2862,7 @@ :: parse a list of coins into a query structure. :: ^- $-((list coin) query) - => depa + => depa:hall-lib |^ %- af :~ [%client ul] [%circles (at /[%p])] @@ -2889,10 +2889,10 @@ $circles =(who who.qer) $public & $burden ?& =(who who.qer) - =(our.bol (above our.bol now.bol who)) + =(our.bol (above:hall-lib our.bol now.bol who)) == $peers =(who our.bol) ::TODO or so-visible? - $report =(who (above [our now our]:bol)) + $report =(who (above:hall-lib [our now our]:bol)) :: $circle ?. (~(has by stories) nom.qer) | @@ -3276,7 +3276,7 @@ ?: =(a 'refederate') ~& 'refederating. may take a while...' :_ +> - =+ bov=(above [our now our]:bol) + =+ bov=(above:hall-lib [our now our]:bol) ?: =(bov our.bol) ~ :~ [ost.bol %pull /burden [bov dap.bol] ~] (wire-to-peer /burden)