ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2025-01-05 13:55:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

transitioned cast to lion, lion to breadth-first, and %tabl not to lose cache due to a missing =. cof cof (again)

Browse Source
This commit is contained in:
Anton Dyudin 2015-05-30 01:28:42 -07:00
parent 8ca9c69be9
commit 072bb7735b
3 changed files with 29 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
base/arvo/clay.hoon
View File

@ -939,7 +939,7 @@
?. ?=(%& -.res)
~| "validate foreign plops failed"
=+ why=?-(-.res %| p.res, %tabl ~[>%bad-marc<])
~> %mean.|.(%.(. >[%plop-fail %why]< |1.+> why))
~> %mean.|.(%*(. >[%plop-fail %why]< |1.+> why))
!!
?> ?=(@ p.p.res)
wake(haw.u.ref (~(put by haw.u.ref) [car cas pax] `p.res))
@ -2524,7 +2524,7 @@
:: ~& ['merge succeeded' p.p.+.q.hin]
[[- ~] ..^$]
~> %slog.
:+ 0 %rose [" " "[" "]"]
:^ 0 %rose [" " "[" "]"]
:^ leaf/"merge failed"
leaf/"please manually merge the desks with"
leaf/":helm+merge %{(trip syd)} {(scow %p her)} %{(trip sud)}"

65
base/arvo/ford.hoon
View File

@ -926,7 +926,7 @@
|= [cof=cafe for=mark]
^- (bolt (list ,@tas))
=+ raf=(fang cof for)
?: =(%2 -.q.raf) (fine p.raf ~)
?: =(%2 -.q.raf) (flue cof)
%+ cope raf
|= [cof=cafe vax=vase]
%+ fine cof
@ -936,9 +936,8 @@
=+ gav=((soft (list ,@tas)) q:(slap vax [%cnzy %garb]))
?~(gav ~ u.gav)
?. (slob %grow p.vax) ~
:: ~& f/lily/for
=+ gow=(slap vax [%cnzy %grow])
(sloe p.gow)
(sort (sloe p.gow) aor)
::
++ lima :: load at depth
|= [cof=cafe for=mark bem=beam arg=heel]
@ -998,37 +997,25 @@
(maul cof u.zat vax)
::
++ lion :: translation search
|= [cof=cafe too=@tas fro=(list ,@tas)]
^- (bolt (list ,@tas))
=| war=(set ,@tas)
=< -:(apex (fine cof fro))
|%
++ apex
|= rof=(bolt (list ,@tas))
^- [(bolt (list ,@tas)) _+>]
?. ?=(%0 -.q.rof) [rof +>.$]
?~ q.q.rof
[[p.rof [%0 p.q.rof ~]] +>.$]
=^ orf +>.$ (apse p.rof i.q.q.rof)
?. ?=(%0 -.q.orf)
[orf +>.$]
?~ q.q.orf
$(p.rof p.orf, q.q.rof t.q.q.rof)
[[p.orf [%0 (grom p.q.rof p.q.orf) q.q.orf]] +>.$]
::
++ apse
|= [cof=cafe for=@tas]
^- [(bolt (list ,@tas)) _+>]
?: =(for too)
[(fine cof [too ~]) +>.$]
?: (~(has in war) for) [(flue cof) +>]
=. war (~(put in war) for)
=^ hoc +>.$ (apex (lily cof for))
:_ +>.$
%+ cope hoc
|= [cof=cafe ked=(list ,@tas)]
(fine cof ?~(ked ~ [for ked]))
--
|= [cof=cafe too=mark fro=(list mark)]
:: ~& lion/[too=too fro=(sa fro)]
^- (bolt (list mark))
=| $: war=(map mark (list mark))
pax=(list mark) won=[p=mark q=(qeu mark)]
==
%. [cof fro]
|= [cof=cafe fro=(list mark)] ^- (bolt (list mark))
?: =(too p.won)
(fine cof (flop pax))
=. fro (skip fro ~(has by war))
=: q.won (~(gas to q.won) fro)
war (~(gas by war) (turn fro |=(mark [+< pax])))
==
?: =(~ q.won)
(flue cof)
=. won ~(get to q.won)
%+ cope (lily cof p.won)
..$(pax [p.won (~(got by war) p.won)])
::
++ lope :: translation pipe
|= [cof=cafe for=mark yaw=(list mark) vax=vase]
@ -1123,12 +1110,12 @@
|= [cof=cafe cay=cage]
^- (bolt gage)
%+ cool |.(leaf/"ford: casting {<p.cay>} to {<p.kas>}")
:: %+ cope (lion cof p.kas p.cay ~) :: XX lion efficiency
:: |= [cof=cafe wuy=(list ,@tas)]
%+ cope (lion cof p.kas p.cay ~)
|= [cof=cafe wuy=(list ,@tas)]
%+ cope
:: ?~ wuy
?~ wuy
(link cof p.kas p.cay q.cay)
:: (lope cof i.wuy t.wuy q.cay)
(lope cof i.wuy t.wuy q.cay)
|= [cof=cafe vax=vase]
(fine cof [%& p.kas vax])
::
@ -1191,7 +1178,7 @@
|= [cof=cafe key=gage]
%+ cope (make cof q.i.p.kas)
|= [cof=cafe val=gage]
%+ cope ^^$(p.kas t.p.kas)
%+ cope ^^$(cof cof, p.kas t.p.kas)
|= [cof=cafe rex=(list (pair gage gage))]
(fine cof [[key val] rex])
|= [cof=cafe rex=(list (pair gage gage))]

2
base/arvo/hoon.hoon
View File

@ -2278,7 +2278,7 @@
?~(b a $(b t.b, a (put(+< a) i.b)))
::
+- get :: head-tail pair
|- ^+ [p=?>(?=(^ a) n.a) q=a]
|- ^+ ?>(?=(^ a) [p=n.a q=*(qeu ,_n.a)])
?~ a
!!
?~ r.a