urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-29 15:14:17 +03:00
Code Issues Packages Projects Releases Wiki Activity

removes +-tap:by accumulator arg and changes calling convention

Browse Source
This commit is contained in:
Joseph Bryan 2017-02-13 15:43:18 -05:00
parent ebed890f00
commit af767350a8
27 changed files with 144 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/ask.hoon
View File

@ -44,7 +44,7 @@
::
++ adrs
=- (sort - lor)
%+ turn (~(tap by adr))
%+ turn ~(tap by adr)
|=({a/email b/time c/invited} [tym=b ask=a inv=c])
::
++ new-adrs (skim adrs |=({@ @ inv/invited} =(%new inv)))

2
app/dojo.hoon
View File

@ -644,7 +644,7 @@
:+ (dy-silk-vase !>([now=now.hid eny=eny.hid bec=he-beak]))
(dy-silk-sources p.cig)
:+ %mute (dy-silk-vase (fall (slew 27 gat) !>(~)))
%+ turn (~(tap by q.cig))
%+ turn ~(tap by q.cig)
|= {a/term b/(unit dojo-source)}
^- (pair wing silk:ford)
:- [a ~]

6
app/mark-dashboard.hoon
View File

@ -58,7 +58,7 @@
=, space:userlib
=, format
=+ .^(arch %cy (en-beam now-beak /mar))
%+ skim (~(tap by dir))
%+ skim ~(tap by dir)
|= {a/mark $~}
?=(^ (file (en-beam now-beak /hoon/[a]/mar)))
::
@ -68,10 +68,10 @@
^- (list {mark $~})
%- zing ^- (list (list {mark $~}))
=/ top .^(arch %cy (en-beam now-beak /mar))
%+ turn (~(tap by dir.top))
%+ turn ~(tap by dir.top)
|= {sub/knot $~}
=+ .^(arch %cy (en-beam now-beak /[sub]/mar))
%+ murn (~(tap by dir))
%+ murn ~(tap by dir)
|= {a/mark $~} ^- (unit {mark $~})
?~ (file (en-beam now-beak /hoon/[a]/[sub]/mar)) ~
`[(rap 3 sub '-' a ~) ~]

54
app/talk.hoon
View File

@ -420,7 +420,7 @@
|= aud/audience
%- sh-poss
%- ~(gas in *(set partner))
(turn (~(tap by aud)) |=({a/partner *} a))
(turn ~(tap by aud) |=({a/partner *} a))
::
++ sh-poss :: passive update
|= lix/(set partner)
@ -468,7 +468,7 @@
=+ grams=grams:(~(got by stories) man.she)
|- ^- (unit (set partner))
?~ grams ~
=+ pan=(silt (turn (~(tap by q.q.i.grams)) head))
=+ pan=(silt (turn ~(tap by q.q.i.grams) head))
?: (~(has in lax) pan) `pan
$(grams t.grams)
::
@ -481,7 +481,7 @@
==
^+ ret
=. ret
=+ eno=(~(tap by one))
=+ eno=~(tap by one)
|- ^+ ret
?~ eno ret
=. ret $(eno t.eno)
@ -491,7 +491,7 @@
?: =(q.i.eno u.unt) ret
ret(cha [[p.i.eno u.unt] cha.ret])
=. ret
=+ owt=(~(tap by two))
=+ owt=~(tap by two)
|- ^+ ret
?~ owt ret
=. ret $(owt t.owt)
@ -509,7 +509,7 @@
==
^+ ret
=. ret
=+ eno=(~(tap by one))
=+ eno=~(tap by one)
|- ^+ ret
?~ eno ret
=. ret $(eno t.eno)
@ -522,7 +522,7 @@
?: =(q.i.eno u.unt) ret
ret(cha [[p.i.eno u.unt] cha.ret])
=. ret
=+ owt=(~(tap by two))
=+ owt=~(tap by two)
|- ^+ ret
?~ owt ret
=. ret $(owt t.owt)
@ -543,7 +543,7 @@
==
^+ ret
=. ret
=+ eno=(~(tap by one))
=+ eno=~(tap by one)
|- ^+ ret
?~ eno ret
=. ret $(eno t.eno)
@ -553,7 +553,7 @@
?: =(q.i.eno u.unt) ret
ret(cha [[p.i.eno u.unt] cha.ret])
=. ret
=+ owt=(~(tap by two))
=+ owt=~(tap by two)
|- ^+ ret
?~ owt ret
=. ret $(owt t.owt)
@ -573,7 +573,7 @@
=. two ~(strip timed two)
^+ ret
=. ret
=+ eno=(~(tap by one))
=+ eno=~(tap by one)
|- ^+ ret
?~ eno ret
=. ret $(eno t.eno)
@ -583,7 +583,7 @@
?: =(q.i.eno u.unt) ret
ret(cha [[p.i.eno u.unt] cha.ret])
=. ret
=+ owt=(~(tap by two))
=+ owt=~(tap by two)
|- ^+ ret
?~ owt ret
=. ret $(owt t.owt)
@ -600,7 +600,7 @@
==
^+ ret
=. ret
=+ eno=(~(tap by one))
=+ eno=~(tap by one)
|- ^+ ret
?~ eno ret
=. ret $(eno t.eno)
@ -608,7 +608,7 @@
ret
ret(old [i.eno old.ret])
=. ret
=+ owt=(~(tap by two))
=+ owt=~(tap by two)
|- ^+ ret
?~ owt ret
=. ret $(owt t.owt)
@ -625,7 +625,7 @@
==
^+ ret
=. ret
=+ eno=(~(tap by one))
=+ eno=~(tap by one)
|- ^+ ret
?~ eno ret
=. ret $(eno t.eno)
@ -633,7 +633,7 @@
ret
ret(old [i.eno old.ret])
=. ret
=+ owt=(~(tap by two))
=+ owt=~(tap by two)
|- ^+ ret
?~ owt ret
=. ret $(owt t.owt)
@ -828,7 +828,7 @@
=. +>.^$ $(new.day t.new.day)
=. +>.^$
(sh-note (weld "new " (~(ta-show ta man.she p.i.new.day) ~)))
(sh-repo-group-diff-here "--" ~ (~(tap by q.i.new.day)) ~)
(sh-repo-group-diff-here "--" ~ ~(tap by q.i.new.day) ~)
=. +>.$
|- ^+ +>.^$
?~ cha.day +>.^$
@ -871,9 +871,9 @@
nak nac
nik %- ~(gas by *(map (set partner) char))
=- (zing `(list (list {(set partner) char}))`-)
%+ turn (~(tap by nac))
%+ turn ~(tap by nac)
|= {a/char b/(set (set partner))}
(turn (~(tap by b)) |=(c/(set partner) [c a]))
(turn ~(tap by b) |=(c/(set partner) [c a]))
==
::
++ sh-repo :: apply report
@ -1077,11 +1077,11 @@
::
++ who :: %who
|= pan/(set partner) ^+ ..sh-work
=< (sh-fact %mor (murn (sort (~(tap by q.owners.she) ~) aor) .))
=< (sh-fact %mor (murn (sort ~(tap by q.owners.she) aor) .))
|= {pon/partner alt/atlas} ^- (unit sole-effect)
?. |(=(~ pan) (~(has in pan) pon)) ~
=- `[%tan rose+[", " `~]^- leaf+~(ta-full ta man.she pon) ~]
=< (murn (sort (~(tap by alt)) aor) .)
=< (murn (sort ~(tap by alt) aor) .)
|= {a/ship b/presence c/human} ^- (unit tank) :: XX names
?- b
$gone ~
@ -1132,7 +1132,7 @@
++ reverse-folks
|= nym/knot
^- (list ship)
%+ murn (~(tap by folks))
%+ murn ~(tap by folks)
|= {p/ship q/human}
?~ hand.q ~
?. =(u.hand.q nym) ~
@ -1143,7 +1143,7 @@
^+ ..sh-work
?: ?=({$~ $~} +<)
%+ sh-fact %mor
%+ turn (~(tap by folks))
%+ turn ~(tap by folks)
|= {p/ship q/human}
:- %txt
?~ hand.q
@ -1347,7 +1347,7 @@
:+ %diff %talk-report
:- %house
%- ~(gas in *(map knot (pair posture cord)))
%+ turn (~(tap by stories))
%+ turn ~(tap by stories)
|=({a/knot b/story} [a p.cordon.shape.b caption.shape.b])
::
++ ra-homes :: update partners
@ -1601,7 +1601,7 @@
++ ra-consume :: consume thought
|= {pub/? her/ship tip/thought}
=. tip (ra-normal tip)
=+ aud=(~(tap by q.tip) ~)
=+ aud=~(tap by q.tip)
|- ^+ +>.^$
?~ aud +>.^$
$(aud t.aud, +>.^$ (ra-conduct pub her p.i.aud tip))
@ -2097,7 +2097,7 @@
^- tape
=+ cha=(~(get by nik) lix)
?^ cha ~[u.cha ' ']
?. (lien (~(tap by lix)) ta-dire)
?. (lien ~(tap by lix) ta-dire)
"* "
?: ?=({{$& ^} $~ $~} lix)
": "
@ -2141,7 +2141,7 @@
++ tr-meta ^- tang
=. wen (sub wen (mod wen (div wen ~s0..0001))) :: round
=+ hed=leaf+"{(scow %uv sen)} at {(scow %da wen)}"
=+ =< paz=(turn (~(tap by aud)) .)
=+ =< paz=(turn ~(tap by aud) .)
|=({a/partner *} leaf+~(ta-full ta man a))
=+ bok=(turn (sort ~(tap in bou) aor) smyt)
[%rose [" " ~ ~] [hed >who< [%rose [", " "to " ~] paz] bok]]~
@ -2178,7 +2178,7 @@
++ tr-pals
^- (set partner)
%- ~(gas in *(set partner))
(turn (~(tap by aud)) |=({a/partner *} a))
(turn ~(tap by aud) |=({a/partner *} a))
::
++ tr-chow
|= {len/@u txt/tape} ^- tape
@ -2331,7 +2331,7 @@
log %- ~(urn by log)
|=({man/knot len/@ud} count:(~(got by stories) man))
==
%+ murn (~(tap by log))
%+ murn ~(tap by log)
|= {man/knot len/@ud}
^- (unit move)
?: (gte len count:(~(got by stories) man))

4
app/twit.hoon
View File

@ -121,7 +121,7 @@
?. (~(has by ran) peer+pax) :: ignore if retracted
~
=+ => |=({a/bone @ b/path} [b a])
pus=(~(gas ju *(jug path bone)) (turn (~(tap by sup)) .))
pus=(~(gas ju *(jug path bone)) (turn ~(tap by sup) .))
?~ (~(get ju pus) pax)
~
~& peer-again+[pax ran]
@ -308,7 +308,7 @@
++ spam :: send by path
|= {a/path b/(list gift)} ^- (list move)
%- zing ^- (list (list move))
%+ turn (~(tap by sup))
%+ turn ~(tap by sup)
|= {ost/bone @ pax/path}
?. =(pax a) ~
(turn b |=(c/gift [ost c]))

2
gen/help.hoon
View File

@ -52,7 +52,7 @@
=/ red ((read-at len (scag len pax)) p.typ ark) :: XX ugly
(drop (bind red rend))
|- ^- tang
=+ =< arl=(~(tap by (~(urn by dir.ark) .)))
=+ =< arl=~(tap by (~(urn by dir.ark) .))
|=({a/@t $~} .^(arch cy+(welp pax /[a])))
%+ welp
=/ dir/(list {@ path})

2
gen/ls/subdir.hoon
View File

@ -8,7 +8,7 @@
|= {vane/?($c $g) pax/path des/(map @t $~)}
^- tank
:+ %rose [" " `~]
%+ turn (sort (~(tap by des)) aor)
%+ turn (sort ~(tap by des) aor)
|= {kid/@ta $~}
=+ paf=`path`/[kid]
=- :+ %rose ["/" ~ ?:(dir "/" ~)]

2
gen/tree.hoon
View File

@ -17,6 +17,6 @@
[(rend pax) -]
%- zing
%+ turn
(sort (~(tap by dir.ark)) aor)
(sort ~(tap by dir.ark) aor)
|= {a/@t $~}
^$(pax (welp pax /[a]))

2
lib/frontmatter.hoon
View File

@ -7,7 +7,7 @@
|%
++ atr-lines
|= atr/(map cord cord)
%+ turn (sort (~(tap by atr)) |=({{a/@ @} {b/@ @}} (aor a b)))
%+ turn (sort ~(tap by atr) |=({{a/@ @} {b/@ @}} (aor a b)))
|= {k/cord v/cord}
(rap 3 k ': ' v ~)
::

2
lib/helm.hoon
View File

@ -125,7 +125,7 @@
=+ top=`path`/(scot %p our)/[syd]/(scot %da now)
=/ van/(list {term $~})
:- zus=[%zuse ~]
(~(tap by dir:.^(arch %cy (welp top /sys/vane))))
~(tap by dir:.^(arch %cy (welp top /sys/vane)))
|= nam/@tas
=. nam
?. =(1 (met 3 nam))

2
lib/map-to-json.hoon
View File

@ -6,4 +6,4 @@
=, format
|* {a/_cord b/_json} :: XX {a/$-(* cord) b/$-(* json)}
|= c/(map _+<.a _+<.b)
(pairs:enjs (turn (~(tap by c)) |*(d/^ [(a -.d) (b +.d)])))
(pairs:enjs (turn ~(tap by c) |*(d/^ [(a -.d) (b +.d)])))

2
lib/womb.hoon
View File

@ -163,7 +163,7 @@
|* {a/(map) b/$-(* (unit))}
^- ?~(a !! (map _p.n.a _(need (b q.n.a))))
%- malt
%+ murn (~(tap by a))
%+ murn ~(tap by a)
?~ a $~
|= _c=n.a ^- (unit _[p.n.a (need (b q.n.a))])
=+ d=(b q.c)

2
lib/write.hoon
View File

@ -70,7 +70,7 @@
^+ all
:- (fall inf.dif -.all)
=; neu (~(uni by neu) put.dif)
=+ del=(~(tap by del.dif)) :: XXX map functions
=+ del=~(tap by del.dif) :: XXX map functions
|- ^+ acc.all
?~ del acc.all
$(del t.del, acc.all (~(del by acc.all) p.i.del))

8
mar/plan.hoon
View File

@ -18,7 +18,7 @@
^- wain
:+ (cat 3 'User ' ?~(who 'of Urbit' who))
(cat 3 'Location ' ?~(loc %unknown loc))
%+ turn (sort (~(tap by acc)) aor)
%+ turn (sort ~(tap by acc) aor)
|= {a/knot b/plan-acct} ^- cord
%+ rap 3
:^ a ': ' usr.b
@ -61,10 +61,10 @@
++ diff
|= neu/_all ^- plan-diff :: XXX map functions
:+ ?:(=(-.all -.neu) ~ (some -.neu))
=< (malt `(list {knot $~})`(murn (~(tap by acc.all)) .))
=< (malt `(list {knot $~})`(murn ~(tap by acc.all) .))
|= {a/knot *} ^- (unit {knot $~})
?:((~(has by acc.neu) a) ~ (some [a ~]))
=< (malt (murn (~(tap by acc.neu)) .))
=< (malt (murn ~(tap by acc.neu) .))
|= {a/knot b/plan-acct} ^- (unit {knot plan-acct})
?: =([~ b] (~(get by acc.all) a))
~
@ -74,7 +74,7 @@
|= dif/plan-diff ^+ all :: XXX map functions
:- (fall inf.dif -.all)
=; neu (~(uni by neu) put.dif)
=+ del=(~(tap by del.dif))
=+ del=~(tap by del.dif)
|- ^+ acc.all
?~ del acc.all
$(del t.del, acc.all (~(del by acc.all) p.i.del))

2
mar/talk/command.hoon
View File

@ -27,7 +27,7 @@
%+ ci
|= a/(map cord _(need *wit))
^- (unit (list _[(wonk *fel) (need *wit)]))
(zl (turn (~(tap by a)) (head-rush fel)))
(zl (turn ~(tap by a) (head-rush fel)))
(om wit)
::
++ ke :: callbacks

4
mar/talk/report.hoon
View File

@ -24,7 +24,7 @@
|^ %+ joba -.rep
?- -.rep
$cabal (cabl +.rep)
$house a+(turn (~(tap by +.rep)) jose)
$house a+(turn ~(tap by +.rep) jose)
$glyph ((jome |=(a/char a) nack) +.rep)
$grams (jobe num+(jone p.rep) tele+[%a (turn q.rep gram)] ~)
$group (jobe local+(grop p.rep) global+%.(q.rep (jome parn grop)) ~)
@ -46,7 +46,7 @@
++ jome :: stringify keys
|* {a/_cord b/_json}
|= c/(map _+<.a _+<.b)
(jobe (turn (~(tap by c)) (both a b)))
(jobe (turn ~(tap by c) (both a b)))
::
++ both :: cons two gates
|* {a/_* b/_*}

2
mar/talk/telegrams.hoon
View File

@ -42,7 +42,7 @@
%+ ci
|= a/(map cord _(need *wit))
^- (unit (list _[(wonk *fel) (need *wit)]))
(zl (turn (~(tap by a)) (head-rush fel)))
(zl (turn ~(tap by a) (head-rush fel)))
(om wit)
::
++ as :: array as set

2
mar/womb/stat-all.hoon
View File

@ -17,7 +17,7 @@
|%
++ json
%- jobe
%+ turn (~(tap by all))
%+ turn ~(tap by all)
|= {a/ship b/stat:womb} ^- {cord ^json}
:- (crip +:<a>)
(jobe live+[%s p.b] dist+(json-dist q.b) ~)

2
ren/rss-xml.hoon
View File

@ -25,7 +25,7 @@
;title: *{hed.sum}
;link: {(ref /)}
;description: *{(no-meta tal.sum)}
;* %+ turn (~(tap by kid))
;* %+ turn ~(tap by kid)
|= {nom/@t hed/marl tal/marl}
;item
;title: *{hed}

2
ren/tree/index.hoon
View File

@ -8,7 +8,7 @@
::
/pub/docs/dev/hoon/runes
/; |= {tip/marl sub/(map knot marl) $~}
(zing `(list marl)`[tip (turn (~(tap by sub)) tail)])
(zing `(list marl)`[tip (turn ~(tap by sub) tail)])
/. /; (getall:tree %h1 ~) /tree-elem/
/_ /; (getall:tree %h1 ~) /tree-elem/
== ==

19
sys/hoon.hoon
View File

@ -1155,7 +1155,7 @@
+- dep :: difference as patch
|* b/_a
^+ [p=a q=a]
=+ c=(~(tap by (def b)))
=+ c=~(tap by (def b))
=+ [d e]=[`_a`~ `_a`~]
|- ^+ [d e]
?~ c [d e]
@ -1326,9 +1326,10 @@
[n=[p=p.n.a q=(b p.n.a q.n.a)] l=$(a l.a) r=$(a r.a)]
::
+- tap :: listify pairs
=< $
~/ %tap
|= b/(list _?>(?=(^ a) n.a))
^+ b
=| b/(list _?>(?=(^ a) n.a))
|. ^+ b
?~ a
b
$(a r.a, b [n.a $(a l.a)])
@ -8352,7 +8353,7 @@
?+ typ ~
{$hold *} $(typ ~(repo ut typ))
{$core *}
(turn (~(tap by q.r.q.typ) ~) |=({a/term *} a))
(turn ~(tap by q.r.q.typ) |=({a/term *} a))
==
::
++ slop :: cons two vases
@ -8598,7 +8599,7 @@
|= hug
^- {twig (list twig)}
=- [a (welp - ?~(c d [[[%rock %tas p.c] q.c] d]))]
=- (~(tap by -))
=- ~(tap by -)
%. |=(e/(list tank) [%knit ~(ram re %rose [" " `~] e)])
=< ~(run by (reel b .))
|= {e/{p/term q/term} f/(jar twig tank)}
@ -9854,7 +9855,7 @@
[(welp "events: " (pi-mumm mon.day)) ~]
::
%+ turn
(~(tap by hit.day) ~)
~(tap by hit.day)
|= {nam/term num/@ud}
:(welp (trip nam) ": " (scow %ud num))
["" ~]
@ -9862,7 +9863,7 @@
%- zing
^- (list (list tape))
%+ turn
%+ sort (~(tap by cut.day))
%+ sort ~(tap by cut.day)
|= {one/(pair path hump) two/(pair path hump)}
(gth (pi-moth mon.q.one) (pi-moth mon.q.two))
|= {pax/path hup/hump}
@ -9875,7 +9876,7 @@
?: =(~ out.hup) ~
:- "into:"
%+ turn
%+ sort (~(tap by out.hup) ~)
%+ sort ~(tap by out.hup)
|=({{* a/@ud} {* b/@ud}} (gth a b))
|= {pax/path num/@ud}
^- tape
@ -9884,7 +9885,7 @@
?: =(~ inn.hup) ~
:- "from:"
%+ turn
%+ sort (~(tap by inn.hup) ~)
%+ sort ~(tap by inn.hup)
|=({{* a/@ud} {* b/@ud}} (gth a b))
|= {pax/path num/@ud}
^- tape

4
sys/vane/ames.hoon
View File

@ -1319,7 +1319,7 @@
urb.ton
%- ~(gas by *(map ship sufi))
%+ turn
(~(tap by urb.ton.fox) ~)
~(tap by urb.ton.fox)
|= {p/ship q/sufi} ^- {p/ship q/sufi}
:- p
%= q
@ -1422,7 +1422,7 @@
::
++ kick :: kick:am
|= hen/duct :: refresh net
=+ aks=(turn (~(tap by urb.ton.fox) ~) |=({p/ship q/sufi} p))
=+ aks=(turn ~(tap by urb.ton.fox) |=({p/ship q/sufi} p))
|- ^- {p/(list boon) q/fort}
?~ aks [~ fox]
=^ buz fox zork:(kick:(um i.aks) hen)

115
sys/vane/clay.hoon
View File

@ -617,7 +617,7 @@
++ duct-lift
|* send/_|=({duct *} ..duct-lift)
|= {a/(set duct) arg/_+<+.send} ^+ ..duct-lift
=+ all=(~(tap by a))
=+ all=~(tap by a)
|- ^+ ..duct-lift
?~ all ..duct-lift
=. +>.send ..duct-lift
@ -714,7 +714,7 @@
|= can/(list path)
^- (map term (pair @ud (set path)))
%- malt ^- (list (trel term @ud (set path)))
%+ murn (~(tap by mon))
%+ murn ~(tap by mon)
|= {nam/term bem/beam}
^- (unit (trel term @ud (set path)))
=- ?~(- ~ `[nam (lent s.bem) (silt `(list path)`-)])
@ -729,7 +729,7 @@
^+ +>
=+ pax=s.bem
=+ cas=(need (case-to-aeon:ze r.bem))
=+ can=(turn (~(tap by q:(aeon-to-yaki:ze cas))) head)
=+ can=(turn ~(tap by q:(aeon-to-yaki:ze cas)) head)
=+ mus=(skim can |=(paf/path =(pax (scag (lent pax) paf))))
?~ mus
+>.$
@ -1222,7 +1222,7 @@
:* hen %pass [%patching (scot %p her) syd ~] %f
%exec our :^ ~ [her syd %da now] %tabl
^- (list (pair silk:ford silk:ford))
%+ turn (~(tap by hat))
%+ turn ~(tap by hat)
|= {a/path b/lobe}
^- (pair silk:ford silk:ford)
:- [%$ %path-hash !>([a b])]
@ -1297,7 +1297,7 @@
?: =(~ mus)
+>.$(dok ~)
=+ ^- sum/(set path)
=+ (turn (~(tap by mus)) (corl tail tail))
=+ (turn ~(tap by mus) (corl tail tail))
%+ roll -
|= {pak/(set path) acc/(set path)}
(~(uni in acc) pak)
@ -1346,9 +1346,9 @@
?. ?=($mime p.mim)
~
`((hard mime) q.q.mim)
=+ mus=(must-ergo (turn (~(tap by can)) head))
=+ mus=(must-ergo (turn ~(tap by can) head))
%- emil
%+ turn (~(tap by mus))
%+ turn ~(tap by mus)
|= {pot/term len/@ud pak/(set path)}
:* u.hez %give %ergo pot
%+ turn ~(tap in pak)
@ -1656,7 +1656,7 @@
::
++ wake :: update subscribers
^+ .
=+ xiq=(~(tap by qyx))
=+ xiq=~(tap by qyx)
=| xaq/(list {p/rove q/(set duct)})
|- ^+ ..wake
?~ xiq
@ -1884,7 +1884,7 @@
|= hat/(map path (pair lobe cage))
^- ankh
:: %- cosh
%+ roll (~(tap by hat) ~)
%+ roll ~(tap by hat)
|= {{pat/path lob/lobe zar/cage} ank/ankh}
^- ankh
:: %- cosh
@ -1951,13 +1951,13 @@
%- aeon-to-yaki
let.dom
=- =+ sar=(silt (turn lar |=({p/path *} p))) :: changed paths
%+ roll (~(tap by hat) ~) :: find unchanged
%+ roll ~(tap by hat) :: find unchanged
=< .(bat bar)
|= {{pax/path gar/lobe} bat/(map path blob)}
?: (~(has in sar) pax) :: has update
bat
%+ ~(put by bat) pax
~| [pax gar (lent (~(tap by lat.ran)))]
~| [pax gar (lent ~(tap by lat.ran))]
(lobe-to-blob gar) :: use original
^= bar ^- (map path blob)
%+ roll lar
@ -2005,7 +2005,7 @@
++ update-lat :: update-lat:ze
|= {lag/(map path blob) sta/(map lobe blob)} :: fix lat
^- {(map lobe blob) (map path lobe)}
%+ roll (~(tap by lag) ~)
%+ roll ~(tap by lag)
=< .(lut sta)
|= {{pat/path bar/blob} {lut/(map lobe blob) gar/(map path lobe)}}
?~ (~(has by lut) p.bar)
@ -2021,7 +2021,6 @@
?: =(0 yon) ~
%- malt
%+ skim
%. ~
%~ tap by
=< q
%- aeon-to-yaki
@ -2091,7 +2090,7 @@
|= {tak/tako bar/(set lobe)}
^- (set lobe)
=+ yak=(tako-to-yaki tak)
%+ roll (~(tap by q.yak) ~)
%+ roll ~(tap by q.yak)
=< .(far bar)
|= {{path lob/lobe} far/(set lobe)}
^- (set lobe)
@ -2163,8 +2162,8 @@
:* ~ ~ %dome -:!>(%dome)
ank=`[[%ank-in-old-v-not-implemented *ankh] ~ ~]
let=yon
hit=(molt (skim (~(tap by hit.dom)) |=({p/@ud *} (lte p yon))))
lab=(molt (skim (~(tap by lab.dom)) |=({* p/@ud} (lte p yon))))
hit=(molt (skim ~(tap by hit.dom) |=({p/@ud *} (lte p yon))))
lab=(molt (skim ~(tap by lab.dom) |=({* p/@ud} (lte p yon))))
==
?: (gth yon let.dom)
~
@ -2232,7 +2231,7 @@
%- molt ^- (list (pair knot $~))
%+ turn
^- (list (pair path lobe))
%+ skim (~(tap by (~(del by q.yak) pax)))
%+ skim ~(tap by (~(del by q.yak) pax))
|= {paf/path lob/lobe}
=(pax (scag len paf))
|= {paf/path lob/lobe}
@ -2258,7 +2257,7 @@
%+ turn
:: ~& %skimming
:: =- ~& %skimmed -
%+ skim (~(tap by (~(del by q.yak) pax)))
%+ skim ~(tap by (~(del by q.yak) pax))
|= {paf/path lob/lobe}
=(pax (scag len paf))
|= {paf/path lob/lobe}
@ -2556,7 +2555,7 @@
=. hut.ran (~(put by hut.ran) r.new.dat new.dat)
=. erg.dat
%- malt ^- (list {path ?})
%+ murn (~(tap by (~(uni by q.bob.dat) q.ali.dat)))
%+ murn ~(tap by (~(uni by q.bob.dat) q.ali.dat))
|= {pax/path lob/lobe}
^- (unit {path ?})
=+ a=(~(get by q.ali.dat) pax)
@ -2587,7 +2586,7 @@
=. new.dat ali.dat
=. erg.dat
%- malt ^- (list {path ?})
%+ murn (~(tap by (~(uni by q.bob.dat) q.ali.dat)))
%+ murn ~(tap by (~(uni by q.bob.dat) q.ali.dat))
|= {pax/path lob/lobe}
^- (unit {path ?})
=+ a=(~(get by q.ali.dat) pax)
@ -2643,12 +2642,12 @@
diff-ali
=. new.dal.dat
%- molt
%+ skip (~(tap by q.ali.dat))
%+ skip ~(tap by q.ali.dat)
|= {pax/path lob/lobe}
(~(has by q.bas.dat) pax)
=. cal.dal.dat
%- molt
%+ skip (~(tap by q.ali.dat))
%+ skip ~(tap by q.ali.dat)
|= {pax/path lob/lobe}
=+ (~(get by q.bas.dat) pax)
|(=(~ -) =([~ lob] -))
@ -2656,7 +2655,7 @@
~
=. old.dal.dat
%- malt ^- (list {path $~})
%+ murn (~(tap by q.bas.dat))
%+ murn ~(tap by q.bas.dat)
|= {pax/path lob/lobe}
^- (unit (pair path $~))
?. =(~ (~(get by q.ali.dat) pax))
@ -2664,12 +2663,12 @@
`[pax ~]
=. new.dob.dat
%- molt
%+ skip (~(tap by q.bob.dat))
%+ skip ~(tap by q.bob.dat)
|= {pax/path lob/lobe}
(~(has by q.bas.dat) pax)
=. cal.dob.dat
%- molt
%+ skip (~(tap by q.bob.dat))
%+ skip ~(tap by q.bob.dat)
|= {pax/path lob/lobe}
=+ (~(get by q.bas.dat) pax)
|(=(~ -) =([~ lob] -))
@ -2677,7 +2676,7 @@
~
=. old.dob.dat
%- malt ^- (list {path $~})
%+ murn (~(tap by q.bas.dat))
%+ murn ~(tap by q.bas.dat)
|= {pax/path lob/lobe}
^- (unit (pair path $~))
?. =(~ (~(get by q.bob.dat) pax))
@ -2697,7 +2696,7 @@
?^ bof
(error:he %meet-conflict >(~(run by `(map path *)`bof) $~)< ~)
=+ ^- old/(map path lobe)
%+ roll (~(tap by (~(uni by old.dal.dat) old.dob.dat)))
%+ roll ~(tap by (~(uni by old.dal.dat) old.dob.dat))
=< .(old q.bas.dat)
|= {{pax/path $~} old/(map path lobe)}
(~(del by old) pax)
@ -2733,7 +2732,7 @@
[%merge (scot %p p.bob) q.bob (scot %p p.ali) q.ali - ~]
%f %exec p.bob ~ [p.oth q.oth r.oth] %tabl
^- (list (pair silk:ford silk:ford))
%+ murn (~(tap by q.bas.dat))
%+ murn ~(tap by q.bas.dat)
|= {pax/path lob/lobe}
^- (unit (pair silk:ford silk:ford))
=+ a=(~(get by q.yak) pax)
@ -2773,12 +2772,12 @@
+>.$
=. new.dal.dat
%- molt
%+ skip (~(tap by q.ali.dat))
%+ skip ~(tap by q.ali.dat)
|= {pax/path lob/lobe}
(~(has by q.bas.dat) pax)
=. cal.dal.dat
%- molt ^- (list (pair path lobe))
%+ murn (~(tap by q.bas.dat))
%+ murn ~(tap by q.bas.dat)
|= {pax/path lob/lobe}
^- (unit (pair path lobe))
=+ a=(~(get by q.ali.dat) pax)
@ -2792,7 +2791,7 @@
=. can.dal.dat p.can
=. old.dal.dat
%- malt ^- (list {path $~})
%+ murn (~(tap by q.bas.dat))
%+ murn ~(tap by q.bas.dat)
|= {pax/path lob/lobe}
?. =(~ (~(get by q.ali.dat) pax))
~
@ -2821,12 +2820,12 @@
+>.$
=. new.dob.dat
%- molt
%+ skip (~(tap by q.bob.dat))
%+ skip ~(tap by q.bob.dat)
|= {pax/path lob/lobe}
(~(has by q.bas.dat) pax)
=. cal.dob.dat
%- molt ^- (list (pair path lobe))
%+ murn (~(tap by q.bas.dat))
%+ murn ~(tap by q.bas.dat)
|= {pax/path lob/lobe}
^- (unit (pair path lobe))
=+ a=(~(get by q.ali.dat) pax)
@ -2840,7 +2839,7 @@
=. can.dob.dat p.can
=. old.dob.dat
%- malt ^- (list {path $~})
%+ murn (~(tap by q.bas.dat))
%+ murn ~(tap by q.bas.dat)
|= {pax/path lob/lobe}
?. =(~ (~(get by q.bob.dat) pax))
~
@ -2861,7 +2860,7 @@
[%merge (scot %p p.bob) q.bob (scot %p p.ali) q.ali %merge ~]
%f %exec p.bob ~ [p.bob q.bob da+now] %tabl
^- (list (pair silk:ford silk:ford))
%+ turn (~(tap by (~(int by can.dal.dat) can.dob.dat)))
%+ turn ~(tap by (~(int by can.dal.dat) can.dob.dat))
|= {pax/path *}
^- (pair silk:ford silk:ford)
=+ cal=(~(got by can.dal.dat) pax)
@ -2901,7 +2900,7 @@
[%merge (scot %p p.bob) q.bob (scot %p p.ali) q.ali %build ~]
%f %exec p.bob ~ [p.bob q.bob da+now] %tabl
^- (list (pair silk:ford silk:ford))
%+ murn (~(tap by bof.dat))
%+ murn ~(tap by bof.dat)
|= {pax/path cay/(unit cage)}
^- (unit (pair silk:ford silk:ford))
?~ cay
@ -2938,7 +2937,7 @@
=. bop.dat p.bop
=+ ^- con/(map path *) :: 2-change conflict
%- molt
%+ skim (~(tap by bof.dat))
%+ skim ~(tap by bof.dat)
|=({pax/path cay/(unit cage)} ?=($~ cay))
=+ ^- cas/(map path lobe) :: conflict base
%- ~(urn by con)
@ -2947,7 +2946,7 @@
=. con :: change+del conflict
%- ~(uni by con)
%- malt ^- (list {path *})
%+ skim (~(tap by old.dal.dat))
%+ skim ~(tap by old.dal.dat)
|= {pax/path $~}
?: (~(has by new.dob.dat) pax)
~| %strange-add-and-del
@ -2956,7 +2955,7 @@
=. con :: change+del conflict
%- ~(uni by con)
%- malt ^- (list {path *})
%+ skim (~(tap by old.dob.dat))
%+ skim ~(tap by old.dob.dat)
|= {pax/path $~}
?: (~(has by new.dal.dat) pax)
~| %strange-del-and-add
@ -2965,21 +2964,21 @@
=. con :: add+add conflict
%- ~(uni by con)
%- malt ^- (list {path *})
%+ skip (~(tap by (~(int by new.dal.dat) new.dob.dat)))
%+ skip ~(tap by (~(int by new.dal.dat) new.dob.dat))
|= {pax/path *}
=((~(got by new.dal.dat) pax) (~(got by new.dob.dat) pax))
?: &(?=($mate gem.dat) ?=(^ con))
=+ (turn (~(tap by `(map path *)`con)) |=({path *} >[+<-]<))
=+ (turn ~(tap by `(map path *)`con) |=({path *} >[+<-]<))
(error:he %mate-conflict -)
=+ ^- old/(map path lobe) :: oldies but goodies
%+ roll (~(tap by (~(uni by old.dal.dat) old.dob.dat)))
%+ roll ~(tap by (~(uni by old.dal.dat) old.dob.dat))
=< .(old q.bas.dat)
|= {{pax/path $~} old/(map path lobe)}
(~(del by old) pax)
=+ ^- can/(map path cage) :: content changes
%- molt
^- (list (pair path cage))
%+ murn (~(tap by bof.dat))
%+ murn ~(tap by bof.dat)
|= {pax/path cay/(unit cage)}
^- (unit (pair path cage))
?~ cay
@ -2987,7 +2986,7 @@
`[pax u.cay]
=^ hot lat.ran :: new content
^- {(map path lobe) (map lobe blob)}
%+ roll (~(tap by can))
%+ roll ~(tap by can)
=< .(lat lat.ran)
|= {{pax/path cay/cage} hat/(map path lobe) lat/(map lobe blob)}
=+ ^= bol
@ -3018,7 +3017,7 @@
:: ~& > hat=(~(run by hat) mug)
=+ ^- del/(map path ?)
(~(run by (~(uni by old.dal.dat) old.dob.dat)) |=($~ %|))
=. gon.dat [%& (silt (turn (~(tap by con)) head))]
=. gon.dat [%& (silt (turn ~(tap by con) head))]
=. new.dat
(make-yaki [r.ali.dat r.bob.dat ~] hat now)
=. hut.ran (~(put by hut.ran) r.new.dat new.dat)
@ -3048,7 +3047,7 @@
[%merge (scot %p p.bob) q.bob (scot %p p.ali) q.ali %checkout ~]
%f %exec p.bob ~ val %tabl
^- (list (pair silk:ford silk:ford))
%+ murn (~(tap by q.new.dat))
%+ murn ~(tap by q.new.dat)
|= {pax/path lob/lobe}
^- (unit (pair silk:ford silk:ford))
?: (~(has by bop.dat) pax)
@ -3079,7 +3078,7 @@
=. ank.dom ank.dat
=> .(..wake wake)
?~ hez done:he
=+ mus=(must-ergo (turn (~(tap by erg.dat)) head))
=+ mus=(must-ergo (turn ~(tap by erg.dat) head))
?: =(~ mus) done:he
ergo
::
@ -3090,8 +3089,8 @@
++ ergo
^+ .
=+ ^- sum/(set path)
=+ (must-ergo (turn (~(tap by erg.dat)) head))
=+ (turn (~(tap by -)) (corl tail tail))
=+ (must-ergo (turn ~(tap by erg.dat) head))
=+ (turn ~(tap by -) (corl tail tail))
%+ roll -
|= {pak/(set path) acc/(set path)}
(~(uni in acc) pak)
@ -3139,10 +3138,10 @@
(error:he %ergo-no-hez ~)
?: ?=($| -.gon.dat)
+>.$
=+ mus=(must-ergo (turn (~(tap by erg.dat)) head))
=+ mus=(must-ergo (turn ~(tap by erg.dat) head))
=< done:he
%- emil
%+ turn (~(tap by mus))
%+ turn ~(tap by mus)
|= {pot/term len/@ud pak/(set path)}
:* u.hez %give %ergo pot
%+ turn ~(tap in pak)
@ -3229,7 +3228,7 @@
^- (set yaki)
?~ unk gud
=+ bun=(~(del in `(set yaki)`unk) n.unk)
?: %+ levy (~(tap by (~(uni in gud) bun)) ~)
?: %+ levy ~(tap by (~(uni in gud) bun))
|= yak/yaki
!(~(has in (~(got by zar) r.yak)) r.n.unk)
$(gud (~(put in gud) n.unk), unk bun)
@ -3280,7 +3279,7 @@
?- -.q.hic
$boat
:_ ..^$
[hen %give %hill (turn (~(tap by mon.ruf)) head)]~
[hen %give %hill (turn ~(tap by mon.ruf) head)]~
::
$drop
=^ mos ruf
@ -3392,11 +3391,11 @@
:_ %_ ..^$
mon.ruf
%- molt
%+ skip (~(tap by mon.ruf))
%+ skip ~(tap by mon.ruf)
(corl (cury test p.q.hic) tail)
==
%+ turn
(skim (~(tap by mon.ruf)) (corl (cury test p.q.hic) tail))
(skim ~(tap by mon.ruf) (corl (cury test p.q.hic) tail))
|= {pot/term bem/beam}
[u.hez.ruf %give %ogre pot]
::
@ -3476,7 +3475,7 @@
$0 =/ cul
|= a/cult-0 ^- cult
%- ~(gas ju *cult)
(turn (~(tap by a)) |=({p/duct q/rove} [q p]))
(turn ~(tap by a) |=({p/duct q/rove} [q p]))
=/ rom
=+ doj=|=(a/dojo-0 a(qyx (cul qyx.a)))
|=(a/room-0 a(dos (~(run by dos.a) doj)))
@ -3652,7 +3651,7 @@
$note [[hen %give +.q.hin]~ ..^$]
$wake
~| %why-wakey !!
:: =+ dal=(turn (~(tap by fat.ruf) ~) |=([a=@p b=room] a))
:: =+ dal=(turn ~(tap by fat.ruf) |=([a=@p b=room] a))
:: =| mos=(list move)
:: |- ^- [p=(list move) q=_..^^$]
:: ?~ dal [mos ..^^$]
@ -3696,7 +3695,7 @@
=+ len=(lent pax)
=+ ^- descendants/(list path)
%+ turn
%+ skim (~(tap by hat))
%+ skim ~(tap by hat)
|= {paf/path lob/lobe}
=(pax (scag len paf))
|= {paf/path lob/lobe}

12
sys/vane/ford.hoon
View File

@ -588,7 +588,7 @@
?- -.q.bot
$0 amok:(expo [%made dep q.q.bot])
$2 amok:(expo [%made dep %| q.q.bot])
$1 =+ zuk=(~(tap by p.q.bot) ~)
$1 =+ zuk=~(tap by p.q.bot)
=< abet
|- ^+ ..exec
?~ zuk ..exec
@ -1107,7 +1107,7 @@
|= {cof/cafe mal/(map mark $~)}
?: (~(has by mal) for)
(cope (lace cof for bem) (flux some))
=+ opt=(silt (turn (~(tap by mal)) head)) :: XX asymptotics
=+ opt=(silt (turn ~(tap by mal) head)) :: XX asymptotics
%+ cope (lion cof for opt)
|= {cof/cafe wuy/(list @tas)}
?~ wuy (flue cof)
@ -1188,7 +1188,7 @@
|= {cof/cafe fro/(set mark)} ^- (bolt (list mark))
?: (~(has in tag) p.won)
(fine cof (flop pax))
=+ for=(skip (~(tap by fro)) ~(has by war))
=+ for=(skip ~(tap by fro) ~(has by war))
=. for (sort for aor) :: XX useful?
=: q.won (~(gas to q.won) for)
war (~(gas by war) (turn for |=(mark [+< pax])))
@ -1490,14 +1490,14 @@
|= {cof/cafe sel/_..body}
^$(src t.src, ..body sel, cof cof)
::
:: ++ libs `(set term)`(silt (turn (~(tap by bil)) head.is))
:: ++ libs `(set term)`(silt (turn ~(tap by bil) head.is))
++ chad :: atomic list
|= {cof/cafe bax/vase doe/term hon/horn}
^- (bolt vase)
%+ cope (lash cof how (flux (slat doe)))
|= {cof/cafe yep/(map knot @)}
=+ ^= poy ^- (list (pair knot @))
%+ sort (~(tap by yep) ~)
%+ sort ~(tap by yep)
|=({{* a/@} {* b/@}} (lth a b))
%+ cope
|- ^- (bolt (list (pair @ vase)))
@ -1895,7 +1895,7 @@
?~ -.q.i.i.a
[%& (turn (turn a2 head) |=(b/mass ?~(-.q.b p.q.b !!)))]
[%| $(a (turn (turn a2 head) |=(b/mass ?~(-.q.b !! p.q.b))))]
%+ turn (~(tap by pol))
%+ turn ~(tap by pol)
|= {@ baby}
:~ =< cache+[%| (turn `(list term)`/hood/bake/slit/slim/slap/slam .)]
=- |=(a/term [a %& (~(get ja dep) a)])

6
sys/vane/gall.hoon
View File

@ -1260,12 +1260,12 @@
:^ hen %give %mass
:- %gall
:- %|
%+ turn (~(tap by pol.all)) :: XX single-home
%+ turn ~(tap by pol.all) :: XX single-home
|= {our/@ mast} ^- mass
:+ (scot %p our) %|
:~ [%foreign [%& sap]]
[%blocked [%| (sort (~(tap by (~(run by wub) |=(sofa [%& +<])))) aor)]]
[%active [%| (sort (~(tap by (~(run by bum) |=(seat [%& +<])))) aor)]]
[%blocked [%| (sort ~(tap by (~(run by wub) |=(sofa [%& +<]))) aor)]]
[%active [%| (sort ~(tap by (~(run by bum) |=(seat [%& +<]))) aor)]]
==
==
::

18
sys/vane/jael.hoon
View File

@ -819,14 +819,14 @@
++ remove :: pig minus gob
|= gob/safe
^- safe
=/ buv (~(tap by gob))
=/ buv ~(tap by gob)
|- ?~ buv pig
$(buv t.buv, pig (delete i.buv))
:: :: ++splice:up
++ splice :: pig plus gob
|= gob/safe
^- safe
=/ buv (~(tap by gob))
=/ buv ~(tap by gob)
|- ?~ buv pig
$(buv t.buv, pig (insert i.buv))
:: :: ++update:up
@ -844,7 +844,7 @@
++ collate :: sort by version
|= ord/$-({{life cert} {life cert}} ?)
^- (list (pair life cert))
(sort (~(tap by pub)) ord)
(sort ~(tap by pub) ord)
:: :: ++current:we
++ current :: current number
^- (unit life)
@ -1250,11 +1250,11 @@
=. sea (~(uni in sea) mor)
=/ wit
=| wit/(set ship)
=/ fem (~(tap by nex))
=/ fem ~(tap by nex)
|- ^+ wit
?~ fem wit
=. wit $(fem t.fem)
=/ naw (~(tap by q.i.fem))
=/ naw ~(tap by q.i.fem)
|- ^+ wit
?~ naw wit
=. wit $(naw t.naw)
@ -1335,7 +1335,7 @@
=/ fub
^- (list (pair ship (unit safe)))
%+ turn
(~(tap by pry.urb))
~(tap by pry.urb)
|= (pair ship (map ship safe))
[p (~(get by q) our)]
=* veg
@ -1364,7 +1364,7 @@
?. (~(has in kyz.rel) who) cod.rel
=- (~(uni by cod.rel) -)
%- ~(gas by *farm)
%+ skim (~(tap by pug.urb))
%+ skim ~(tap by pug.urb)
|=({who/ship *} (lth who 65.536))
::
(~(home fire hec) who)
@ -1559,7 +1559,7 @@
cod/farm
==
^+ +>
=+ lec=(~(tap by cod))
=+ lec=~(tap by cod)
|- ^+ ..meet
?~ lec ..meet
%= $
@ -1983,7 +1983,7 @@
::
:: sow: all new signatures
::
=+ sow=`(list (trel ship life @))`(~(tap by syg.new))
=+ sow=`(list (trel ship life @))`~(tap by syg.new)
|- ^- (pair (list change) cert)
?~ sow [~ u.eld]
::

8
sys/zuse.hoon
View File

@ -3131,7 +3131,7 @@
|= jon/json ^- (map _(wonk *fel) _*wit)
=/ jom ((om wit) jon)
%- malt
%+ turn (~(tap by jom))
%+ turn ~(tap by jom)
|* {a/cord b/*}
=> .(+< [a b]=+<)
[(rash a fel) b]
@ -3280,7 +3280,7 @@
?~ jom ~
%- drop-map
%- malt
%+ turn (~(tap by jom))
%+ turn ~(tap by jom)
|* {a/cord b/*}
(both (rush a fel) (some b))
:: :: ++pe:dejs-soft:
@ -3555,7 +3555,7 @@
$o
:- '{'
=. rez ['}' rez]
=+ viz=(~(tap by p.val))
=+ viz=~(tap by p.val)
?~ viz rez
!.
|- ^+ rez
@ -4536,7 +4536,7 @@
:: :: ++pale:pubsub:
++ pale :: filter peers
|= {hid/bowl fun/$-(sink ?)}
(skim (~(tap by sup.hid)) fun)
(skim ~(tap by sup.hid) fun)
:: :: ++prix:pubsub:
++ prix :: filter gate
|= pax/path |= sink ^- ?