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

Clay refactored to top-level redes.

Browse Source
This commit is contained in:
C. Guy Yarvin 2014-05-29 19:26:35 -07:00
parent 7d0be097de
commit f729afacb1
2 changed files with 43 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
arvo/clay.hoon
View File

@ -1,5 +1,5 @@
!: !:
:: clay (4c), revision control :: clay (4c), version control
:: ::
|= pit=vase |= pit=vase
^- vane ^- vane
@ -267,6 +267,25 @@
== ==
== ==
-- --
::
++ do
|= [now=@da [who=ship him=ship] syd=@tas ruf=raft]
=+ ^= rug ^- rung
=+ rug=(~(get by hoy.ruf) him)
?^(rug u.rug *rung)
=+ ^= red ^- rede
=+ yit=(~(get by rus.rug) syd)
?^(yit u.yit `rede`[~2000.1.1 ~ [~ *rind] *dome])
((de now ~ ~) [who him] syd red)
::
++ posh
|= [him=ship syd=desk red=rede ruf=raft]
^- raft
=+ ^= rug ^- rung
=+ rug=(~(get by hoy.ruf) him)
?^(rug u.rug *rung)
ruf(hoy (~(put by hoy.ruf) him rug(rus (~(put by rus.rug) syd red))))
::
++ un :: domestic ship ++ un :: domestic ship
|= [who=@p now=@da ruf=raft] |= [who=@p now=@da ruf=raft]
=+ ^= yar ^- room =+ ^= yar ^- room
@ -285,16 +304,6 @@
|= [syd=@ta red=rede] |= [syd=@ta red=rede]
%_(+> dos.yar (~(put by dos.yar) syd [qyx.red dom.red])) %_(+> dos.yar (~(put by dos.yar) syd [qyx.red dom.red]))
:: ::
++ posh
|= [for=@p syd=@ta red=rede]
%_ +>
rid.yar
=+ ^= rob ^- (map ,@tas rede)
=+ rob=(~(get by rid.yar) for)
?~(rob ~ u.rob)
(~(put by rid.yar) for (~(put by rob) syd red))
==
::
++ wake ++ wake
=+ saz=(turn (~(tap by dos.yar) ~) |=([a=@tas b=*] a)) =+ saz=(turn (~(tap by dos.yar) ~) |=([a=@tas b=*] a))
=| moz=(list move) =| moz=(list move)
@ -310,15 +319,6 @@
=+ saq=(~(get by dos.yar) syd) =+ saq=(~(get by dos.yar) syd)
?~(saq *dojo u.saq) ?~(saq *dojo u.saq)
((de now hun.yar hez.yar) [who who] syd now p.saq ~ q.saq) ((de now hun.yar hez.yar) [who who] syd now p.saq ~ q.saq)
::
++ do
|= [him=ship syd=@tas]
=+ ^= red ^- rede
=+ roy=(~(get by rid.yar) him)
=+ yit=?~(roy ~ (~(get by u.roy) syd))
?^(yit u.yit `rede`[~2000.1.1 ~ [~ *rind] *dome])
:: ~& [%do-qyx him syd qyx.red]
((de now hun.yar hez.yar) [who him] syd red)
-- --
-- --
:::::::::::::::::::::::::::::::::::::::::::::::::::::::: ::::::::::::::::::::::::::::::::::::::::::::::::::::::::
@ -341,7 +341,7 @@
$(fav ((hard card) p.fav)) $(fav ((hard card) p.fav))
:: ::
%init %init
[~ ..^$(fat.ruf (~(put by fat.ruf) p.fav [hen ~ ~ ~]))] [~ ..^$(fat.ruf (~(put by fat.ruf) p.fav [hen ~ ~]))]
:: ::
?(%info %into) ?(%info %into)
?: =(%$ q.fav) ?: =(%$ q.fav)
@ -361,28 +361,27 @@
=+ syd=(need (slaw %tas i.tea)) =+ syd=(need (slaw %tas i.tea))
=+ inx=(need (slaw %ud i.t.tea)) =+ inx=(need (slaw %ud i.t.tea))
=^ mos ruf =^ mos ruf
=+ une=(un p.p.fav now ruf) =+ ^= zot
=+ zot=abet:wake:(knit:(do:une q.p.fav syd) [inx ((hard riot) q.fav)]) abet:wake:(knit:(do now p.fav syd ruf) [inx ((hard riot) q.fav)])
:- -.zot [-.zot (posh q.p.fav syd +.zot ruf)]
abet:(posh:une q.p.fav syd +.zot)
[mos ..^$] [mos ..^$]
:: ::
%warp %warp
=^ mos ruf =^ mos ruf
=+ une=(un p.p.fav now ruf) ?: =(p.p.fav q.p.fav)
=+ ^= wex =+ une=(un p.p.fav now ruf)
?. =(p.p.fav q.p.fav) =+ wex=(di:une p.q.fav)
(do:une q.p.fav p.q.fav) =+ ^= woo
(di:une p.q.fav) ?~ q.q.fav
abet:(ease:wex hen)
abet:(eave:wex hen u.q.q.fav)
[-.woo abet:(pish:une p.q.fav +.woo)]
=+ wex=(do now p.fav p.q.fav ruf)
=+ ^= woo =+ ^= woo
?~ q.q.fav ?~ q.q.fav
abet:(ease:wex hen) abet:(ease:wex hen)
abet:(eave:wex hen u.q.q.fav) abet:(eave:wex hen u.q.q.fav)
:- -.woo [-.woo (posh q.p.fav p.q.fav +.woo ruf)]
=< abet
?: =(p.p.fav q.p.fav)
(pish:une p.q.fav +.woo)
(posh:une q.p.fav p.q.fav +.woo)
[mos ..^$] [mos ..^$]
:: ::
%wart %wart
@ -413,7 +412,7 @@
=+ 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) =| mos=(list move)
|- ^- [p=(list move) q=vane] |- ^- [p=(list move) q=vane]
?~ dal [mos ..^^$(las.ruf now)] ?~ dal [mos ..^^$]
=+ une=(un i.dal now ruf) =+ une=(un i.dal now ruf)
=^ som une wake:une =^ som une wake:une
$(dal t.dal, ruf abet:une, mos (weld som mos)) $(dal t.dal, ruf abet:une, mos (weld som mos))
@ -451,27 +450,16 @@
++ scry :: inspect ++ scry :: inspect
|= [fur=(unit (set monk)) ren=@tas his=ship syd=desk lot=coin tyl=path] |= [fur=(unit (set monk)) ren=@tas his=ship syd=desk lot=coin tyl=path]
^- (unit (unit)) ^- (unit (unit))
=+ ^= whu ^- (unit ,@p) :: XX HEINOUS! =+ got=(~(has by fat.ruf) his)
?: (~(has by fat.ruf) his)
`his
=+ foo=`(list ,[p=ship q=room])`(~(tap by fat.ruf) ~)
|- ^- (unit ,@p)
?~ foo ~
?: (~(has by rid.q.i.foo) his) `p.i.foo
$(foo t.foo)
?~ whu ~
=+ our=u.whu
:: ~? !=(`our whu) [%clay-scry whu our ren his syd lot tyl]
=+ luk=?.(?=(%$ -.lot) ~ ((soft case) p.lot)) =+ luk=?.(?=(%$ -.lot) ~ ((soft case) p.lot))
?~ luk [~ ~] ?~ luk [~ ~]
=+ une=(un our now ruf) =+ une=(un his now ruf)
?: =(%$ ren) ?: =(%$ ren)
[~ ~] [~ ~]
=+ run=((soft care) ren) =+ run=((soft care) ren)
?~ run [~ ~] ?~ run [~ ~]
%. [u.run u.luk tyl] %. [u.run u.luk tyl]
=+ dud=?.(=(our his) (do:une his syd) (di:une syd)) =+ dud=?.(got (do now [his his] syd ruf) (di:une syd))
:: ~& [%scry-at [our his] now lim.dud]
aver:dud aver:dud
:: ::
++ stay `vase`!>(ruf) ++ stay `vase`!>(ruf)

9
arvo/zuse.hoon
View File

@ -2369,8 +2369,8 @@
mis=(map ,@ud ,[p=cape q=flap r=(unit)]) :: misordered mis=(map ,@ud ,[p=cape q=flap r=(unit)]) :: misordered
== :: == ::
++ raft :: filesystem ++ raft :: filesystem
$: las=@da :: last wakeup $: fat=(map ship room) :: domestic
fat=(map ,@p room) :: per host hoy=(map ship rung) :: foreign
== :: == ::
++ rank ?(%czar %king %duke %earl %pawn) :: ship width class ++ rank ?(%czar %king %duke %earl %pawn) :: ship width class
++ rant :: namespace binding ++ rant :: namespace binding
@ -2409,11 +2409,12 @@
$: hun=duct :: terminal duct $: hun=duct :: terminal duct
hez=(unit duct) :: sync duct hez=(unit duct) :: sync duct
dos=(map ,@tas ,[p=cult q=dome]) :: native desk dos=(map ,@tas ,[p=cult q=dome]) :: native desk
rid=(map ship (map ,@tas rede)) :: neighbors
== :: == ::
++ rock ,@uvO :: packet ++ rock ,@uvO :: packet
++ rout ,[p=(list host) q=path r=oryx s=path] :: http route (new) ++ rout ,[p=(list host) q=path r=oryx s=path] :: http route (new)
++ rump ,[p=care q=case r=@tas s=path] :: relative path ++ rump ,[p=care q=case r=@tas s=path] :: relative path
++ rung $: rus=(map desk rede) :: neighbor desks
== ::
++ saba ,[p=ship q=@tas r=moar s=(list nori)] :: patch/merge ++ saba ,[p=ship q=@tas r=moar s=(list nori)] :: patch/merge
++ sufi :: domestic host ++ sufi :: domestic host
$: hoy=(list ship) :: hierarchy $: hoy=(list ship) :: hierarchy
@ -2421,7 +2422,7 @@
law=will :: server will law=will :: server will
seh=(map hand ,[p=ship q=@da]) :: key cache seh=(map hand ,[p=ship q=@da]) :: key cache
hoc=(map ship door) :: neighborhood hoc=(map ship door) :: neighborhood
== == ::
++ salt ,@uv :: entropy ++ salt ,@uv :: entropy
++ seal :: auth conversation ++ seal :: auth conversation
$: whu=(unit ship) :: client identity $: whu=(unit ship) :: client identity