ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-20 05:11:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

waypoint

Browse Source
This commit is contained in:
Philip C Monk 2015-02-10 20:36:02 -05:00
parent b2b6fe4949
commit 0e128a1a3e
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
arvo/clay.hoon
View File

@ -82,13 +82,14 @@
[%call p=silk q=silk] :: slam [%call p=silk q=silk] :: slam
[%cast p=mark q=silk] :: translate [%cast p=mark q=silk] :: translate
[%diff p=silk q=silk] :: diff [%diff p=silk q=silk] :: diff
[%done p=(set beam) q=cage] :: literal [%done p=(set beam) q=gage] :: literal
[%dude p=tank q=silk] :: error wrap [%dude p=tank q=silk] :: error wrap
[%dune p=(set beam) q=(unit cage)] :: unit literal [%dune p=(set beam) q=(unit gage)] :: unit literal
[%mute p=silk q=(list (pair wing silk))] :: mutant [%mute p=silk q=(list (pair wing silk))] :: mutant
[%pact p=silk q=silk] :: patch [%pact p=silk q=silk] :: patch
[%reef ~] :: kernel reef [%reef ~] :: kernel reef
[%ride p=twig q=silk] :: silk thru twig [%ride p=twig q=silk] :: silk thru twig
[%tabl p=(list (pair silk silk))] :: list
[%vale p=mark q=ship r=*] :: validate [our his] [%vale p=mark q=ship r=*] :: validate [our his]
== :: == ::
++ raft :: filesystem ++ raft :: filesystem
@ -347,6 +348,7 @@
++ edit :: apply changes ++ edit :: apply changes
|= [wen=@da lem=nori] |= [wen=@da lem=nori]
^+ +> ^+ +>
~& > [%editing syd]
?: ?=(%| -.lem) ?: ?=(%| -.lem)
=^ hat +>.$ =^ hat +>.$
(edit:ze wen lem) (edit:ze wen lem)
@ -512,7 +514,7 @@
+>.$ +>.$
:: ::
++ take-patch ++ take-patch
|= [pax=path res=(each bead (list tank))] |= res=(each bead (list tank))
^+ +> ^+ +>
?: ?=(%| -.res) ?: ?=(%| -.res)
%_ +>.$ %_ +>.$
@ -576,14 +578,15 @@
++ checkout-ankh ++ checkout-ankh
|= hat=(map path lobe) |= hat=(map path lobe)
^+ +> ^+ +>
~& > [%first-checkout syd (lent (~(tap by hat)))]
%_ +>.$ %_ +>.$
tag tag
:_ tag :_ tag
:^ hen :^ hen
[%patching (scot %p who) syd pax] [%patching (scot %p who) syd ~]
%f %f
:^ %exec who ~ :- %tabl :^ %exec who ~ :- %tabl
^- (list (pair silk)) ^- (list (pair silk silk))
%+ turn (~(tap by hat)) %+ turn (~(tap by hat))
|= [a=path b=lobe] |= [a=path b=lobe]
^- (pair silk silk) ^- (pair silk silk)
@ -593,7 +596,7 @@
?- -.bob ?- -.bob
%direct [%done ~ q.bob] %direct [%done ~ q.bob]
%indirect [%done ~ q.bob] %indirect [%done ~ q.bob]
%delta [%pact $(bar q.bob) [%done ~ r.bob]] %delta [%pact $(b q.bob) [%done ~ r.bob]]
== ==
== ==
:: ::
@ -835,7 +838,8 @@
let.dom let.dom
=- =+ sar=(sa (turn lar |=([p=path *] p))) :: changed paths =- =+ sar=(sa (turn lar |=([p=path *] p))) :: changed paths
%+ roll (~(tap by hat) ~) :: find unchanged %+ roll (~(tap by hat) ~) :: find unchanged
|= [[pat=path gar=lobe] bat=_bar] =< .(bat bar)
|= [[pat=path gar=lobe] bat=(map path blob)]
?: (~(has in sar) pat) :: has update ?: (~(has in sar) pat) :: has update
bat bat
(~(put by bat) pat (lobe-to-blob gar)) :: use original (~(put by bat) pat (lobe-to-blob gar)) :: use original
@ -977,6 +981,7 @@
:: ?~ p.yak !! :: no parent, no diff :: ?~ p.yak !! :: no parent, no diff
:: :+ %& *cart :: diff w/ 1st parent :: :+ %& *cart :: diff w/ 1st parent
:: (~(tap by (diff-yakis (tako-to-yaki i.p.yak) yak)) ~) :: (~(tap by (diff-yakis (tako-to-yaki i.p.yak) yak)) ~)
::
++ forge-yaki :: forge-yaki:ze ++ forge-yaki :: forge-yaki:ze
|= [wen=@da par=(unit tako) lem=suba] :: forge yaki |= [wen=@da par=(unit tako) lem=suba] :: forge yaki
=+ ^= per =+ ^= per
@ -1004,6 +1009,11 @@
$(p +.p, pax +.pax) $(p +.p, pax +.pax)
== == == ==
:: ::
++ make-nako :: gack a through b
|= [a=aeon b=aeon]
^- [(map aeon tako) aeon (set yaki) (set blob)]
!!
::
++ query :: query:ze ++ query :: query:ze
|= ren=?(%u %v %x %y %z) :: endpoint query |= ren=?(%u %v %x %y %z) :: endpoint query
^- (unit cage) ^- (unit cage)
@ -1063,6 +1073,7 @@
[lut (~(put by gar) pat p.bar)] [lut (~(put by gar) pat p.bar)]
:- (~(put by lut) p.bar bar) :- (~(put by lut) p.bar bar)
(~(put by gar) pat p.bar) (~(put by gar) pat p.bar)
::
++ zu :: filesystem ++ zu :: filesystem
|= ank=ankh :: filesystem state |= ank=ankh :: filesystem state
=| ram=path :: reverse path into =| ram=path :: reverse path into
@ -1356,19 +1367,19 @@
[mos ..^$] [mos ..^$]
:: ::
%patching %patching
?> ?=([@ @ *] t.tea) ?> ?=([@ @ ~] t.tea)
=+ who=(slav %p i.t.tea) =+ who=(slav %p i.t.tea)
=+ syd=(slav %tas i.t.t.tea) =+ syd=(slav %tas i.t.t.tea)
=^ mos ruf =^ mos ruf
?: (~(has by fat.ruf) who) ?: (~(has by fat.ruf) who)
=+ une=(un who now hen ruf) =+ une=(un who now hen ruf)
=+ ^= zat =+ ^= zat
(take-patch:(di:wake:une syd) t.t.t.tea p.q.hin) (take-patch:(di:wake:une syd) p.q.hin)
=+ zot=abet.zat =+ zot=abet.zat
[-.zot abet:(pish:une syd +.zot ran.zat)] [-.zot abet:(pish:une syd +.zot ran.zat)]
=+ zax=(do now hen [who who] syd ruf) =+ zax=(do now hen [who who] syd ruf)
=+ ^= zat =+ ^= zat
(take-patch:zax t.t.t.tea p.q.hin) (take-patch:zax p.q.hin)
=+ zot=abet.zat =+ zot=abet.zat
[-.zot (posh who syd +.zot ruf)] [-.zot (posh who syd +.zot ruf)]
[mos ..^$] [mos ..^$]

2
arvo/ford.hoon
View File

@ -986,7 +986,7 @@
|= [cof=cafe rex=(list (pair marc marc)) rey=vase] |= [cof=cafe rex=(list (pair marc marc)) rey=vase]
(fine cof [[p.key p.val] rex] (slop (slop q.key q.val) rey)) (fine cof [[p.key p.val] rex] (slop (slop q.key q.val) rey))
|= [cof=cafe rex=(list (pair marc marc)) rey=vase] |= [cof=cafe rex=(list (pair marc marc)) rey=vase]
(fine cof [%tabl rex] !>(rex)) (fine cof [%tabl rex] rey)
:: ::
%vale %vale
%+ cool |.(leaf/"ford: vale {<p.kas>} {<q.kas>} {<`@p`(mug r.kas)>}") %+ cool |.(leaf/"ford: vale {<p.kas>} {<q.kas>} {<`@p`(mug r.kas)>}")