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

Merge various changes

Browse Source
This commit is contained in:
Gavin Whelan 2014-05-30 16:13:44 -07:00
commit cded6c902d
11 changed files with 44 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arvo/ames.hoon
View File

@ -1445,11 +1445,6 @@
^- [p=(list move) q=vane]
(take ~ hen typ fav)
::
++ come
|= [sam=? old=vase]
^- vane
(load old)
::
++ doze
|= [now=@da hen=duct]
=+ doz=`(unit ,@da)`[~ (add now ~s32)]
@ -1471,10 +1466,6 @@
?. (~(nest ut -:!>(fox)) | p.new) ~&(%ames-reset ..^$)
..^$(fox ~(boot am [now (furt q.new)]))
::
++ raze
^- vane
..$(fox *furt)
::
++ scry
|= [fur=(unit (set monk)) ren=@tas his=ship syd=desk lot=coin tyl=path]
^- (unit (unit))
@ -1494,7 +1485,6 @@
==
::
++ stay `vase`!>(fox)
++ vern [164 0]
--
|%
++ claw |=(our=ship ^-(duct hen:(need (~(get by zac.fox) our))))

13
arvo/batz.hoon
View File

@ -1145,7 +1145,8 @@
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
:: section 4bC, shell vane ::
::
=| $: big=(unit ,@p) :: major ship
=| $: %0
big=(unit ,@p) :: major ship
dez=(map duct brim) :: state by ship
== ::
|= [now=@da eny=@ ska=$+(* (unit (unit)))] :: current invocation
@ -1251,11 +1252,6 @@
|= [hen=duct typ=type fav=card]
(take ~ hen typ fav)
::
++ come
|= [sam=? old=vase]
^- vane
(load old)
::
++ doze
|= [now=@da hen=duct]
^- (unit ,@da)
@ -1282,15 +1278,10 @@
~? !(~(nest ut -:!>(dez)) | p.old) %batz-reset
..^$(dez ((map duct brim) q.old))
::
++ raze
^- vane
..$(dez ~)
::
++ scry
|= [fur=(unit (set monk)) ren=@tas his=ship syd=desk lot=coin tyl=path]
^- (unit (unit))
~
::
++ stay `vase`!>(dez)
++ vern [164 0]
--

13
arvo/clay.hoon
View File

@ -325,7 +325,8 @@
:: section 4cA, filesystem vane ::
:: ::
=| :: instrument state
$: ruf=raft :: revision tree
$: %0 :: vane version
ruf=raft :: revision tree
== ::
|= [now=@da eny=@ ska=$+(* (unit (unit)))] :: activate
^? :: opaque core
@ -422,11 +423,6 @@
|= [hen=duct typ=type fav=card]
(take ~ hen typ fav)
::
++ come
|= [sam=? old=vase]
^- vane
(load old)
::
++ doze
|= [now=@da hen=duct]
=| nex=(unit ,@da)
@ -443,10 +439,6 @@
..^$
..^$(ruf (raft q.old))
::
++ raze
^- vane
..$(ruf *raft)
::
++ scry :: inspect
|= [fur=(unit (set monk)) ren=@tas his=ship syd=desk lot=coin tyl=path]
^- (unit (unit))
@ -463,5 +455,4 @@
aver:dud
::
++ stay `vase`!>(ruf)
++ vern [164 0]
--

13
arvo/dill.hoon
View File

@ -3,7 +3,8 @@
::
|= pit=vase
^- vane :: kernel instrument
=| $: dug=(map duct yard)
=| $: %0 ::
dug=(map duct yard) ::
== ::
|= [now=@da eny=@ ska=$+(* (unit (unit)))] :: current invocation
^? :: opaque core
@ -439,11 +440,6 @@
|= [hen=duct typ=type fav=card]
(take ~ hen typ fav)
::
++ come
|= [sam=? old=vase]
^- vane
(load old)
::
++ doze
|= [now=@da hen=duct]
^- (unit ,@da)
@ -458,15 +454,10 @@
dug ((map duct yard) q.new)
==
::
++ raze
^- vane
..$(dug ~)
::
++ scry
|= [fur=(unit (set monk)) ren=@tas his=ship syd=desk lot=coin tyl=path]
^- (unit (unit))
~
::
++ stay `vase`!>(dug)
++ vern [164 0]
--

15
arvo/eyre.hoon
View File

@ -24,7 +24,8 @@
(~(put by a) b (~(put in d) c))
--
++ bolo :: eyre state
$: gub=@t :: random identity
$: %0 :: version
gub=@t :: random identity
hov=(unit ,@p) :: master for remote
ged=duct :: client interface
ney=@uvI :: rolling entropy
@ -1843,11 +1844,6 @@
|= [hen=duct typ=type fav=card]
(take ~ hen typ fav)
::
++ come
|= [sam=? old=vase]
^- vane
(load old)
::
++ doze
|= [now=@da hen=duct]
^- (unit ,@da)
@ -1861,16 +1857,11 @@
..^$
..^$(+>- (bolo q.old))
::
++ raze
^- vane
..$(+>- *bolo)
::
++ scry
|= [our=(unit (set monk)) ren=@tas who=ship syd=desk lot=coin tyl=path]
^- (unit (unit))
~
::
++ stay
`vase`!>((colt `bolo`+>-.$))
++ vern [164 0]
`vase`!>((colt `bolo`+>-.$))
--

12
arvo/ford.hoon
View File

@ -6,7 +6,7 @@
=> =~
|% :: structures
++ axle :: all %ford state
$: ven=%0 :: version for update
$: %0 :: version for update
pol=(map ship baby) ::
== ::
++ baby :: state by ship
@ -588,11 +588,6 @@
|= [hen=duct typ=type fav=card]
(take ~ hen typ fav)
::
++ come
|= [sam=? old=vase]
^- vane
(load old)
::
++ doze
|= [now=@da hen=duct]
^- (unit ,@da)
@ -606,10 +601,6 @@
..^$
..^$(+>- (axle q.old))
::
++ raze
^- vane
..$(+>- *axle)
::
++ scry
|= [fur=(unit (set monk)) ren=@tas who=ship syd=desk lot=coin tyl=path]
^- (unit (unit))
@ -617,5 +608,4 @@
::
++ stay
`vase`!>((colt `axle`+>-.$))
++ vern [164 0]
--

40
arvo/gall.hoon
View File

@ -5,7 +5,7 @@
=> =~
|% :::::::::::::::::::::::::::::::::::::::::::::::::::::: structures
++ axle :: all %gall state
$: ven=%0 :: state version
$: %0 :: state version
pol=(map ship mast) :: apps by ship
== ::
++ bone ,@ud :: opaque duct
@ -186,32 +186,20 @@
%z z.vew
==
::
:: XXX old vane junk - fix and/or destroy
++ doze
|= [now=@da hen=duct]
^- (unit ,@da)
~
::
++ come
|= [sam=? old=vase]
^+ ..^$
(load old)
::
++ doze
|= [now=@da hen=duct]
^- (unit ,@da)
~
::
++ load
|= old=vase
^+ ..^$
?. (~(nest ut -:!>(`axle`+>-.^$)) | p.old)
~& %gall-reset
..^$
..^$(all (axle q.old))
::
++ raze
^+ ..$
..$(all *axle)
::
++ stay `vase`!>((colt `axle`+>-.$))
++ vern [164 0]
++ load
|= old=vase
^+ ..^$
?. (~(nest ut -:!>(`axle`+>-.^$)) | p.old)
~& %gall-reset
..^$
..^$(all (axle q.old))
::
++ stay `vase`!>((colt `axle`+>-.$))
--
|% :: inner core
++ gaur :: take and go

28
arvo/hoon.hoon
View File

@ -8877,18 +8877,7 @@
=+ rig=(slym ves arg)
=+ rev=(slym (slap bud (rain pax txt)) bud)
=+ syg=(slym rev arg)
=+ ole=(slap rig [%cnzy %stay])
=+ [vol=(slap rig [%cnzy %vern]) vew=(slap syg [%cnzy %vern])]
?> =(stub -.q.vew)
?: =(q.vol q.vew)
+>.$(ves (slam (slap syg [%cnzy %load]) ole))
=+ ^= sam
?: =(stub -.q.vol)
?>(=(+.q.vew +(((hard ,@) +.q.vol))) &)
?>(&(=(0 +.q.vew) =(-.q.vol +(stub))) |)
%= +>.$
ves (slam (slap syg [%cnzy %come]) (slop [[%cube sam %atom %f] sam] ole))
==
+>.$(ves (slam (slap syg [%cnzy %load]) (slap rig [%cnzy %stay])))
::
++ wink :: deploy
|= [now=@da eny=@ sky=$+(* (unit (unit)))]
@ -9140,10 +9129,16 @@
=| haz=@uw :: hash
=< |%
++ come |= [@ (list ovum) pone] :: 11
!!
^- [(list ovum) _+>]
~& %hoon-come
=^ rey +>+ (^come +<)
[rey +>.$]
++ keep |=(* (^keep ((hard ,[@da path]) +<))) :: 4
++ load |= [@ (list ovum) pane] :: 86
!!
^- [(list ovum) _+>]
~& %hoon-load
=^ rey +>+ (^load +<)
[rey +>.$]
++ peek |=(* (^peek ((hard ,[@da path]) +<))) :: 87
++ poke |= * :: 42
^- [(list ovum) *]
@ -9162,6 +9157,11 @@
++ wish |=(* (^wish ((hard ,@ta) +<))) :: 20
--
|%
++ come :: load incompatible
|= [yen=@ ova=(list ovum) nyf=pone]
^+ [ova +>]
(load yen ova (turn nyf |=([a=@tas b=vise] [a (slim b)])))
::
++ keep :: wakeup delay
|= [now=@da hap=path]
=> .(+< ((hard ,[now=@da hap=path]) +<))

8
arvo/zuse.hoon
View File

@ -2228,7 +2228,8 @@
wid=@ud :: logical wdow msgs
== ::
++ furt :: formal state
$: hop=@da :: network boot date
$: %0 :: version
hop=@da :: network boot date
ton=toun :: security
zac=(map ship corn) :: flows by server
== ::
@ -2613,16 +2614,12 @@
== ::
:- p=*(list move) :: actions
q=*vane :: consequence
++ come :: load state, stale
|= [sam=? old=vase] ::
*vane ::
++ doze :: next wakeup
|= [now=@da hen=duct] :: channel
*(unit ,@da) :: alarm if any
++ load :: load state, fresh
|= old=vase ::
*vane ::
++ raze *vane :: erase all state
++ scry :: inspect
|= $: fur=(unit (set monk)) :: observers
ren=@tas :: submode
@ -2641,7 +2638,6 @@
== ::
:- p=*(list move) :: actions
q=*vane :: consequence
++ vern [_@ud _@ud] :: hoon/vane version
-- ::
++ view ?(%u %v %w %x %y %z) :: view mode
++ wund (list ,[p=life q=ring r=acru]) :: mace in action

2
main/bin/reboot.hoon
View File

@ -16,6 +16,8 @@
[%c %clay]
[%d %dill]
[%e %eyre]
[%f %ford]
[%g %gall]
==
:_ ~
%+ turn vay

2
main/bin/reset.hoon
View File

@ -21,6 +21,8 @@
[%c %clay]
[%d %dill]
[%e %eyre]
[%f %ford]
[%g %gall]
==
%+ turn vay
|= [a=@tas b=@tas]