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

Minor interface changes

Browse Source
This commit is contained in:
Gavin Whelan 2014-05-31 14:11:11 -07:00
parent a03634a7e1
commit 7eea04ce1e
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arvo/zuse.hoon
View File

@ -1013,11 +1013,12 @@
[(awoe -.alt) (alot +.alt)] [(awoe -.alt) (alot +.alt)]
:: ::
++ auld :: auld:ez ++ auld :: auld:ez
|= [gem=germ sab=saba] :: construct merge |= [gem=germ who=ship des=desk sab=saba] :: construct merge
^- (unit (unit nori)) :::::: ^- (unit (unit nori)) ::::::
=+ ^= viq ^- [p=@ud q=@ud r=waks] :: merge status =+ ^= viq ^- [p=@ud q=@ud r=waks] :: merge status
=+ viq=(~(get by ang) [p.sab q.sab]) :: =+ viq=(~(get by ang) [p.sab q.sab]) ::
?~(viq [0 0 ~] u.viq) :: ?~(viq [0 0 ~] u.viq) ::
=. sab sab(s (skip s.sab (clen who des))) ::
=. sab :: =. sab ::
?: =(q.viq p.r.sab) sab :: perfect motion ?: =(q.viq p.r.sab) sab :: perfect motion
?> (gth q.viq p.r.sab) :: proper motion ?> (gth q.viq p.r.sab) :: proper motion
@ -1025,7 +1026,6 @@
p.r q.viq :: p.r q.viq ::
s (slag (sub q.viq p.r.sab) s.sab) :: remove excess s (slag (sub q.viq p.r.sab) s.sab) :: remove excess
== :: == ::
=. sab sab(s (skip s.sab (clen p.sab q.sab))) ::
?~ s.sab [~ ~] :: up to date ?~ s.sab [~ ~] :: up to date
=+ ^= mus ^- masu :: sync square =+ ^= mus ^- masu :: sync square
[p.sab q.sab [p.viq +(let)] [q.viq q.r.sab] r.viq] [p.sab q.sab [p.viq +(let)] [q.viq q.r.sab] r.viq]
@ -1036,7 +1036,7 @@
%+ skip %+ skip
%+ turn (scag (sub let p.viq) hit) :: remove excess %+ turn (scag (sub let p.viq) hit) :: remove excess
|=(a=frog q.a) |=(a=frog q.a)
(clen p.sab q.sab) (clen who des)
=+ tig=(mang [arum r.viq tak kat] |=(* *(unit))) :: moves =+ tig=(mang [arum r.viq tak kat] |=(* *(unit))) :: moves
?^ tig ?^ tig
=+ res=((hard ,[waks (list tako)]) u.tig) =+ res=((hard ,[waks (list tako)]) u.tig)

2
main/bin/update.hoon
View File

@ -18,7 +18,7 @@
=+ der=((hard dome) .^(%cv /(scot %p bos)/[des]/[wen])) =+ der=((hard dome) .^(%cv /(scot %p bos)/[des]/[wen]))
=+ owr=((hard dome) .^(%cv /(scot %p who)/[des]/[wen])) =+ owr=((hard dome) .^(%cv /(scot %p who)/[des]/[wen]))
=+ sab=`saba`[bos des [0 let.der] (flop (turn hit.der |=(a=frog q.a)))] =+ sab=`saba`[bos des [0 let.der] (flop (turn hit.der |=(a=frog q.a)))]
=+ lum=(~(auld ze est owr) ?~(gem %fine -.gem) sab) =+ lum=(~(auld ze est owr) ?~(gem %fine -.gem) who des sab)
?~ lum ?~ lum
^- gift ^- gift
[%la %leaf "{(trip des)} failed to merge, please rerun with a merge option"] [%la %leaf "{(trip des)} failed to merge, please rerun with a merge option"]

8
try/bin/merge.hoon
View File

@ -15,12 +15,14 @@
=+ vsr=((hard dome) .^(%cv pes)) =+ vsr=((hard dome) .^(%cv pes))
=+ ves=((hard dome) .^(%cv pen)) =+ ves=((hard dome) .^(%cv pen))
=+ ^= sab ^- saba :* =+ ^= sab ^- saba :*
(need (slaw 'p' sen.pen)) (need (slaw 'p' ses.pes))
den.pen des.pes
[0 let.vsr] [0 let.vsr]
(flop (turn hit.vsr |=(a=frog q.a))) (flop (turn hit.vsr |=(a=frog q.a)))
== ==
=+ lum=(~(auld ze est ves) ?~(gem %fine -.gem) sab) =+ ^= lum
%- ~(auld ze est ves)
[?~(gem %fine -.gem) (need (slaw 'p' sen.pen)) den.pen sab]
?~ lum ?~ lum
^- gift ^- gift
:* %la %leaf :* %la %leaf