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

Merging

Browse Source
This commit is contained in:
Gavin Whelan 2014-05-29 11:52:49 -07:00
commit fa518297f1
3 changed files with 84 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
arvo/gall.hoon
View File

@ -287,7 +287,38 @@
++ show :: view ++ show :: view
|= pax=path |= pax=path
^- lens ^- lens
!! ?~ huv.sat *lens
=+ gat=(slap u.huv.sat [%cnzy %peek])
=+ cor=(slam gat !>(pax))
=+ ^= dek
|* fun=$+(vase *)
|= nam=@tas
=+ vax=(slap cor [%cnzy nam])
^- (unit (unit fun))
?: =(~ q.vax) ~
?: =([~ ~] q.vax) [~ ~]
[~ ~ (fun (slot 7 vax))]
=+ ^= nib
|= vax=vase
((hard null) q.vax)
=+ ^= yob
|= vax=vase ^- cage
[((hard lode) -.q.vax) (slot 3 vax)]
=+ ^= yar
|= vax=vase ^- arch
((hard arch) q.vax)
=+ ^= dif
|= vax=vase ^- (unit cage)
?: =(~ q.vax) ~
[~ (yob (slot 3 vax))]
|%
++ u ((dek nib) %u)
++ v ((dek yob) %v)
++ w ((dek dif) %w)
++ x ((dek yob) %x)
++ y ((dek yar) %y)
++ z ((dek yob) %z)
--
:: ::
++ bo ++ bo
|_ $: hen=duct :: system cause |_ $: hen=duct :: system cause

75
arvo/hoon.hoon
View File

@ -8798,6 +8798,7 @@
[%ud p=@ud] :: sequence [%ud p=@ud] :: sequence
== :: == ::
++ desk ,@tas :: ship desk case spur ++ desk ,@tas :: ship desk case spur
++ cage ,[p=lode q=vase] :: structured data
++ chop :: permissions ++ chop :: permissions
$: p=(unit (set monk)) :: readers $: p=(unit (set monk)) :: readers
q=(set monk) :: authors q=(set monk) :: authors
@ -8826,13 +8827,14 @@
++ lens :: observation core ++ lens :: observation core
$_ ^? :: $_ ^? ::
|% ++ u *(unit (unit ,~)) :: existence |% ++ u *(unit (unit ,~)) :: existence
++ v *(unit (unit (disk))) :: full history ++ v *(unit (unit cage)) :: full history
++ w *(unit (unit (unit (disk)))) :: latest diff ++ w *(unit (unit (unit cage))) :: latest diff
++ x *(unit (unit (disk))) :: data at path ++ x *(unit (unit cage)) :: data at path
++ y *(unit (unit arch)) :: directory ++ y *(unit (unit arch)) :: directory
++ z *(unit (unit (disk))) :: current subtree ++ z *(unit (unit cage)) :: current subtree
-- :: -- ::
++ logo ,@tas :: content type ++ logo ,@tas :: content type
++ lode $|(@tas [p=lode q=lode]) :: constructed logos
++ mark ,@uvH :: type by core hash ++ mark ,@uvH :: type by core hash
++ mill (each vase milt) :: vase/metavase ++ mill (each vase milt) :: vase/metavase
++ milt ,[p=* q=*] :: metavase ++ milt ,[p=* q=*] :: metavase
@ -8851,12 +8853,19 @@
++ pane (list ,[p=@tas q=vase]) :: kernel modules ++ pane (list ,[p=@tas q=vase]) :: kernel modules
++ pone (list ,[p=@tas q=vise]) :: kernel modules, old ++ pone (list ,[p=@tas q=vise]) :: kernel modules, old
++ ship ,@p :: network identity ++ ship ,@p :: network identity
++ sled $+ [(unit (set monk)) bead] :: namespace function
(unit (unit cage)) ::
++ vile :: reflexive constants
$: typ=type :: -:!>(*type)
mev=type :: -:!>([%meta *vase])
moh=type :: -:!>(*(list mosh))
== ::
++ wire path :: event pretext ++ wire path :: event pretext
:::::::::::::::::::::::::::::::::::::::::::::::::::::::::: ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
:: section 3bE, Arvo core :: :: section 3bE, Arvo core ::
:: ::
++ vent !: :: vane core ++ vent :: vane core
|= [bud=vase ves=vase] |= [vil=vile bud=vase ves=vase]
|% |%
++ ruck :: update vase ++ ruck :: update vase
|= [pax=path txt=@ta] |= [pax=path txt=@ta]
@ -8890,14 +8899,19 @@
++ sike :: check metatype ++ sike :: check metatype
|= [sub=type ref=*] |= [sub=type ref=*]
^- ? ^- ?
?: =(~ ~) &
=+ gat=|=([a=type b=type] (~(nest ut a) | b)) =+ gat=|=([a=type b=type] (~(nest ut a) | b))
(,? .*(gat(+< [sub ref]) -.gat)) (,? .*(gat(+< [sub ref]) -.gat))
:: ::
++ souk :: check type ++ souk :: check type
|=([sub=type ref=type] (~(nest ut sub) | ref)) |= [sub=type ref=type]
?: =(~ ~) &
(~(nest ut sub) | ref)
:: ::
++ sunk :: type is cell ++ sunk :: type is cell
|=(ref=type (souk [%cell %noun %noun] ref)) |= ref=type
?: =(~ ~) &
(souk [%cell %noun %noun] ref)
:: ::
++ song :: reduce metacard ++ song :: reduce metacard
|= mex=vase :: mex: vase of card |= mex=vase :: mex: vase of card
@ -8907,17 +8921,21 @@
?. ?=(%meta -.q.mex) [%& mex] :: ordinary card ?. ?=(%meta -.q.mex) [%& mex] :: ordinary card
=+ tiv=(slot 3 mex) :: tiv: vase of vase =+ tiv=(slot 3 mex) :: tiv: vase of vase
?. (sunk p.tiv) :: a vase is a cell ?. (sunk p.tiv) :: a vase is a cell
~& %song-b !! ~& %song-b !! ::
?. (souk -:!>(*type) p:(slot 2 tiv)) :: vase head is type ?. (souk typ.vil p:(slot 2 tiv)) :: vase head is type
~& %song-c !! :: ~& %song-c !! ::
=+ mut=(,[p=* q=*] q.tiv) :: card type, value =+ mut=(,[p=* q=*] q.tiv) :: card type, value
:- %| :: metacard :- %| :: metacard
|- ^- [p=* q=*] :: |- ^- [p=* q=*] ::
?. ?=([%meta p=* q=[p=* q=*]] q.mut) mut :: ordinary metacard ?. ?=([%meta p=* q=[p=* q=*]] q.mut) mut :: ordinary metacard
?. (sike -:!>([%meta vase]) p.mut) :: meta-metacard ?. (sike mev.vil p.mut) :: meta-metacard
~& %song-d !! :: ~& %song-d !! ::
$(mut q.mut) :: descend into meta $(mut q.mut) :: descend into meta
:: ::
++ spuc
|= vax=vase
vax
::
++ sump ++ sump
|= wec=vase |= wec=vase
^- move ^- move
@ -8944,7 +8962,7 @@
:: ::
++ said ++ said
|= vud=vase |= vud=vase
?. (~(nest ut -:!>(*(list mosh))) | p.vud) !! :: ?. (~(nest ut moh.vil) | p.vud) !!
|- ^- (list move) |- ^- (list move)
?: =(~ q.vud) ~ ?: =(~ q.vud) ~
[(sump (slot 2 vud)) $(vud (slot 3 vud))] [(sump (slot 2 vud)) $(vud (slot 3 vud))]
@ -8984,11 +9002,20 @@
-- --
:: ::
++ vint :: create vane ++ vint :: create vane
|= [bud=vase pax=path txt=@ta] :: |= [vil=vile bud=vase pax=path txt=@ta] ::
(vent bud (slym (slap bud (rain pax txt)) bud)) (vent vil bud (slym (slap bud (rain pax txt)) bud))
::
++ viol :: vane tools
|= but=type
^- vile
=+ pal=|=(a=@t ^-(type (~(play ut but) (vice a))))
:* typ=(pal '_type')
mev=(pal '_[%meta vase]')
moh=(pal '_(list mosh)')
==
:: ::
++ is :: operate in time ++ is :: operate in time
|= [eny=@ bud=vase fan=(list ,[p=@tas q=vase])] |= [vil=vile eny=@ bud=vase fan=(list ,[p=@tas q=vase])]
|_ now=@da |_ now=@da
++ beck ++ beck
|= fur=(unit (set monk)) |= fur=(unit (set monk))
@ -9013,7 +9040,7 @@
|- ^- (unit (unit)) |- ^- (unit (unit))
?~ fan ~ ?~ fan ~
?. =(dis p.i.fan) $(fan t.fan) ?. =(dis p.i.fan) $(fan t.fan)
%- scry:(wink:(vent bud q.i.fan) now (shax now) ..^$) %- scry:(wink:(vent vil bud q.i.fan) now (shax now) ..^$)
[fur rem his q.p.u.dyc u.ved tyl] [fur rem his q.p.u.dyc u.ved tyl]
:: ::
++ dink :: vase by char ++ dink :: vase by char
@ -9033,7 +9060,7 @@
:: ::
++ doos :: sleep until ++ doos :: sleep until
|= hap=path ^- (unit ,@da) |= hap=path ^- (unit ,@da)
(doze:(wink:(vent bud (dink (dint hap))) now 0 (beck ~)) now [hap ~]) (doze:(wink:(vent vil bud (dink (dint hap))) now 0 (beck ~)) now [hap ~])
:: ::
++ hurl :: start loop ++ hurl :: start loop
|= ovo=ovum |= ovo=ovum
@ -9044,7 +9071,7 @@
++ race :: take ++ race :: take
|= [pux=(unit wire) hen=duct hil=mill ves=vase] |= [pux=(unit wire) hen=duct hil=mill ves=vase]
^- [p=(list move) q=vase] ^- [p=(list move) q=vase]
=+ ven=(vent bud ves) =+ ven=(vent vil bud ves)
=+ win=(wink:ven now (shax now) (beck ~)) =+ win=(wink:ven now (shax now) (beck ~))
(swim:win pux hen hil) (swim:win pux hen hil)
:: ::
@ -9097,6 +9124,7 @@
:::::: :::::::::::::::::::::::::::::::::::::::::::::::::::::: :::::: ::::::::::::::::::::::::::::::::::::::::::::::::::::::
=+ pit=`vase`!>(.) :: =+ pit=`vase`!>(.) ::
=+ bud=pit :: becomes tang =+ bud=pit :: becomes tang
=+ vil=(viol p.bud) :: cached reflexives
=| eny=@ :: entropy =| eny=@ :: entropy
=| fan=(list ,[p=@tas q=vase]) :: =| fan=(list ,[p=@tas q=vase]) ::
=| hom=path :: source path =| hom=path :: source path
@ -9139,7 +9167,7 @@
++ keep :: wakeup delay ++ keep :: wakeup delay
|= [now=@da hap=path] |= [now=@da hap=path]
=> .(+< ((hard ,[now=@da hap=path]) +<)) => .(+< ((hard ,[now=@da hap=path]) +<))
(~(doos (is eny bud fan) now) hap) (~(doos (is vil eny bud fan) now) hap)
:: ::
++ load :: load compatible ++ load :: load compatible
|= [yen=@ ova=(list ovum) nyf=pane] |= [yen=@ ova=(list ovum) nyf=pane]
@ -9158,7 +9186,7 @@
|= [now=@da hap=path] |= [now=@da hap=path]
^- (unit) ^- (unit)
?~ hap [~ stub] ?~ hap [~ stub]
=+ rob=((~(beck (is eny bud fan) now) ~) hap) =+ rob=((~(beck (is vil eny bud fan) now) ~) hap)
?~ rob ~ ?~ rob ~
?~ u.rob ~ ?~ u.rob ~
[~ u.u.rob] [~ u.u.rob]
@ -9166,9 +9194,10 @@
++ poke :: external apply ++ poke :: external apply
|= [now=@da ovo=ovum] |= [now=@da ovo=ovum]
=. eny (mix eny (shax now)) =. eny (mix eny (shax now))
~& [%poke -.q.ovo]
^- [(list ovum) _+>] ^- [(list ovum) _+>]
=^ zef fan =^ zef fan
(~(hurl (is eny bud fan) now) ovo) (~(hurl (is vil eny bud fan) now) ovo)
[zef +>.$] [zef +>.$]
:: ::
++ vega :: reboot kernel ++ vega :: reboot kernel
@ -9204,11 +9233,11 @@
|- ^+ fan |- ^+ fan
?~ fan ?~ fan
~& [%vane `@tas`lal pax `@p`(mug txt)] ~& [%vane `@tas`lal pax `@p`(mug txt)]
[[lal ves:(vint bud pax txt)] fan] [[lal ves:(vint vil bud pax txt)] fan]
?. =(lal p.i.fan) ?. =(lal p.i.fan)
[i.fan $(fan t.fan)] [i.fan $(fan t.fan)]
~& [%vane `@tas`lal pax `@p`(mug txt)] ~& [%vane `@tas`lal pax `@p`(mug txt)]
[[p.i.fan ves:(ruck:(vent bud q.i.fan) pax txt)] t.fan] [[p.i.fan ves:(ruck:(vent vil bud q.i.fan) pax txt)] t.fan]
== ==
:: ::
++ wish :: external compute ++ wish :: external compute

2
arvo/zuse.hoon
View File

@ -2046,7 +2046,6 @@
++ bray ,[p=life q=(unit life) r=ship s=@da] :: our parent us now ++ bray ,[p=life q=(unit life) r=ship s=@da] :: our parent us now
++ brow ,[p=@da q=@tas] :: browser version ++ brow ,[p=@da q=@tas] :: browser version
++ buck ,[p=mace q=will] :: all security data ++ buck ,[p=mace q=will] :: all security data
++ cage ,[p=lode q=vase] :: structured data
++ cake ,[p=sock q=skin r=@] :: top level packet ++ cake ,[p=sock q=skin r=@] :: top level packet
++ cape :: end-to-end result ++ cape :: end-to-end result
$? %good :: delivered $? %good :: delivered
@ -2343,7 +2342,6 @@
++ lice ,[p=ship q=buck] :: full license ++ lice ,[p=ship q=buck] :: full license
++ life ,@ud :: regime number ++ life ,@ud :: regime number
++ lint (list rock) :: fragment array ++ lint (list rock) :: fragment array
++ lode $|(@tas [p=lode q=lode]) :: constructed logos
++ love $% :: http response ++ love $% :: http response
[%ham p=manx] :: html node [%ham p=manx] :: html node
[%mid p=mite q=octs] :: mime-typed data [%mid p=mite q=octs] :: mime-typed data