mirror of
https://github.com/ilyakooo0/urbit.git
synced 2024-11-11 04:48:00 +03:00
Merge branch 'master' into newbreach
Conflicts: urb/urbit.pill urb/zod/arvo/zuse.hoon
This commit is contained in:
Steve Dee
commit
ff4b3d877c
@ -1434,8 +1434,7 @@
|
||||
=<
|
||||
|% :: vane interface
|
||||
++ beat
|
||||
|= [wru=(unit writ) tea=wire hen=duct fav=curd]
|
||||
=> .(fav ((hard card) fav))
|
||||
|= [wru=(unit writ) tea=wire hen=duct fav=card]
|
||||
^- [p=(list move) q=vane]
|
||||
=^ duy ..knap
|
||||
(knap wru tea hen fav)
|
||||
|
||||
@ -1148,8 +1148,7 @@
|
||||
^? :: opaque core
|
||||
|% :: poke/peek pattern
|
||||
++ beat :: process move
|
||||
|= [wru=(unit writ) tea=wire hen=duct fav=curd]
|
||||
=> .(fav ((hard card) fav))
|
||||
|= [wru=(unit writ) tea=wire hen=duct fav=card]
|
||||
^- [p=(list move) q=vane]
|
||||
?: ?=([%crud *] fav)
|
||||
[[[wru [/d hen] [%flog fav]] ~] ..^$]
|
||||
|
||||
@ -367,8 +367,7 @@
|
||||
^? :: opaque core
|
||||
|% ::
|
||||
++ beat :: update
|
||||
|= [wru=(unit writ) tea=wire hen=duct fav=curd]
|
||||
=> .(fav ((hard card) fav))
|
||||
|= [wru=(unit writ) tea=wire hen=duct fav=card]
|
||||
^- [p=(list move) q=vane]
|
||||
?+ -.fav [[[wru hen fav] ~] ..^$]
|
||||
%crud
|
||||
|
||||
@ -5,12 +5,11 @@
|
||||
^- vane :: kernel instrument
|
||||
=| $: dug=(map duct yard)
|
||||
== ::
|
||||
|= [now=@da eny=@ sky=$+(* (unit))] :: current invocation
|
||||
|= [now=@da eny=@ sky=$+(* (unit))] :: current invocation
|
||||
^? :: opaque core
|
||||
|% :: poke/peek pattern
|
||||
++ beat :: process move
|
||||
|= [wru=(unit writ) tea=wire hen=duct fav=curd]
|
||||
=> .(fav ((hard card) fav))
|
||||
|= [wru=(unit writ) tea=wire hen=duct fav=card]
|
||||
^- [p=(list move) q=vane]
|
||||
?: ?=(%flog -.fav)
|
||||
:_ ..^$
|
||||
|
||||
@ -1767,8 +1767,7 @@
|
||||
^? :: opaque core
|
||||
|% ::
|
||||
++ beat :: process move
|
||||
|= [wru=(unit writ) tea=wire hen=duct fav=curd]
|
||||
=> .(fav ((hard card) fav))
|
||||
|= [wru=(unit writ) tea=wire hen=duct fav=card]
|
||||
=. ney (shax :(mix (shax now) +(eny) ney)) :: XX!! shd not need
|
||||
?: ?=(%crud -.fav)
|
||||
[[[wru [/d hen] %flog fav] ~] ..^$]
|
||||
|
||||
124
arvo/hoon.hoon
124
arvo/hoon.hoon
@ -910,6 +910,10 @@
|
||||
c +(c)
|
||||
d (add d (lsh 0 c =((end 0 1 a) (end 0 1 b))))
|
||||
==
|
||||
::
|
||||
++ not |= [a=bloq b=@ c=@] :: binary not (sized)
|
||||
(mix c (dec (bex (mul b (bex a)))))
|
||||
::
|
||||
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||
:: section 2cC, noun orders ::
|
||||
::
|
||||
@ -4755,6 +4759,73 @@
|
||||
=+ p=(mix (dis e f) (dis (inv e) g)) :: ch
|
||||
=+ q=:(sum h o p (wac j kbx) (wac j wox)) :: t1
|
||||
$(j +(j), a (sum q n), b a, c b, d c, e (sum d q), f e, g f, h g)
|
||||
::
|
||||
++ shan :: sha-1 (deprecated)
|
||||
|= ruz=@
|
||||
=+ [few==>(fe .(a 5)) wac=|=([a=@ b=@] (cut 5 [a 1] b))]
|
||||
=+ [sum=sum.few ror=ror.few rol=rol.few net=net.few inv=inv.few]
|
||||
=+ ral=(lsh 0 3 (met 3 ruz))
|
||||
=+ ^= ful
|
||||
%+ can 0
|
||||
:~ [ral ruz]
|
||||
[8 128]
|
||||
[(mod (sub 960 (mod (add 8 ral) 512)) 512) 0]
|
||||
[64 (~(net fe 6) ral)]
|
||||
==
|
||||
=+ lex=(met 9 ful)
|
||||
=+ kbx=0xca62.c1d6.8f1b.bcdc.6ed9.eba1.5a82.7999
|
||||
=+ hax=0xc3d2.e1f0.1032.5476.98ba.dcfe.efcd.ab89.6745.2301
|
||||
=+ i=0
|
||||
|-
|
||||
?: =(i lex)
|
||||
hax
|
||||
=+ ^= wox
|
||||
=+ dux=(cut 9 [i 1] ful)
|
||||
=+ wox=(rep 5 (turn (rip 5 dux) net))
|
||||
=+ j=16
|
||||
|- ^- @
|
||||
?: =(80 j)
|
||||
wox
|
||||
=+ :* l=(wac (sub j 3) wox)
|
||||
m=(wac (sub j 8) wox)
|
||||
n=(wac (sub j 14) wox)
|
||||
o=(wac (sub j 16) wox)
|
||||
==
|
||||
=+ z=(rol 0 1 :(mix l m n o))
|
||||
$(wox (con (lsh 5 j z) wox), j +(j))
|
||||
=+ j=0
|
||||
=+ :* a=(wac 0 hax)
|
||||
b=(wac 1 hax)
|
||||
c=(wac 2 hax)
|
||||
d=(wac 3 hax)
|
||||
e=(wac 4 hax)
|
||||
==
|
||||
|- ^- @
|
||||
?: =(80 j)
|
||||
%= ^$
|
||||
i +(i)
|
||||
hax %+ rep 5
|
||||
:~
|
||||
(sum e (wac 4 hax))
|
||||
(sum d (wac 3 hax))
|
||||
(sum c (wac 2 hax))
|
||||
(sum b (wac 1 hax))
|
||||
(sum a (wac 0 hax))
|
||||
==
|
||||
==
|
||||
=+ fx=(con (dis b c) (dis (not 5 1 b) d))
|
||||
=+ fy=:(mix b c d)
|
||||
=+ fz=:(con (dis b c) (dis b d) (dis c d))
|
||||
=+ ^= tem
|
||||
?: &((gte j 0) (lte j 19))
|
||||
:(sum (rol 0 5 a) fx e (wac 0 kbx) (wac j wox))
|
||||
?: &((gte j 20) (lte j 39))
|
||||
:(sum (rol 0 5 a) fy e (wac 1 kbx) (wac j wox))
|
||||
?: &((gte j 40) (lte j 59))
|
||||
:(sum (rol 0 5 a) fz e (wac 2 kbx) (wac j wox))
|
||||
:(sum (rol 0 5 a) fy e (wac 3 kbx) (wac j wox))
|
||||
$(j +(j), a tem, b a, c (rol 0 30 b), d c, e d)
|
||||
::
|
||||
::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
|
||||
:: section 2eZ, OLD rendering (kill me) ::
|
||||
::
|
||||
@ -5249,6 +5320,10 @@
|
||||
|= [gat=type sam=type]
|
||||
(~(play ut [%cell gat sam]) [%cncl [~ 2] [~ 3]])
|
||||
::
|
||||
++ slym
|
||||
|= [gat=vase sam=*] ^- vase
|
||||
(slap gat(+<.q sam) [%cnzy %$])
|
||||
::
|
||||
++ slap
|
||||
|= [vax=vase gen=twig] ^- vase
|
||||
=+ gun=(~(mint ut p.vax) %noun gen)
|
||||
@ -8597,44 +8672,11 @@
|
||||
$% [%lead p=ship] :: foreign
|
||||
== ::
|
||||
++ hilt ?(0 1 2) :: lead iron gold
|
||||
++ move ,[p=(unit writ) q=duct r=curd] :: typeless move
|
||||
++ muve ,[p=(unit writ) q=duct r=curd] :: typeless move
|
||||
++ ovum ,[p=wire q=curd] :: typeless ovum
|
||||
++ pane (list ,[p=@tas q=vase]) :: kernel modules
|
||||
++ pone (list ,[p=@tas q=vise]) :: kernel modules, old
|
||||
++ ship ,@p :: network identity
|
||||
++ vane $_ :: kernel actor
|
||||
|+ [now=@da eny=@ sky=$+(* (unit))] :: activate
|
||||
^? |% ::
|
||||
++ beat :: update
|
||||
|= $: wru=(unit writ) :: calling identity
|
||||
pax=wire :: pretext
|
||||
hen=duct :: channel
|
||||
fav=curd :: event
|
||||
== ::
|
||||
:- 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
|
||||
|= $: our=ship :: observer
|
||||
ren=@tas :: submode
|
||||
his=ship :: target
|
||||
syd=@tas :: project
|
||||
lot=coin :: version
|
||||
tyl=path :: location
|
||||
== ::
|
||||
*(unit) :: record
|
||||
++ stay *vase :: save state, new
|
||||
++ vern [_@ud _@ud] :: hoon/vane version
|
||||
-- ::
|
||||
++ vile :: reflexive constants
|
||||
$: bet=type :: beat
|
||||
nim=type :: scry
|
||||
@ -8697,9 +8739,9 @@
|
||||
hen=duct
|
||||
fav=curd
|
||||
==
|
||||
^- [p=(list move) q=_+>.^$]
|
||||
=+ pro=(slam (slap rig [%cnzy %beat]) [bet.vil +<])
|
||||
:- ((hard (list move)) q:(slap pro [%cnzy %p]))
|
||||
^- [p=(list muve) q=_+>.^$]
|
||||
=+ pro=(slym (slap rig [%cnzy %beat]) +<.$)
|
||||
:- ((hard (list muve)) q:(slap pro [%cnzy %p]))
|
||||
=+ sev=(slap pro [%cnzy %q])
|
||||
%= +>.^$
|
||||
ves
|
||||
@ -8711,7 +8753,7 @@
|
||||
++ doze
|
||||
|= [now=@da hen=duct]
|
||||
^- (unit ,@da)
|
||||
((hard (unit ,@da)) q:(slam (slap rig [%cnzy %doze]) [hoz.vil +<]))
|
||||
((hard (unit ,@da)) q:(slym (slap rig [%cnzy %doze]) +<))
|
||||
::
|
||||
++ scry
|
||||
|= $: our=ship
|
||||
@ -8721,7 +8763,7 @@
|
||||
lot=coin
|
||||
tyl=path
|
||||
==
|
||||
=+ pro=(slam (slap rig [%cnzy %scry]) [nim.vil +<])
|
||||
=+ pro=(slym (slap rig [%cnzy %scry]) +<)
|
||||
((hard (unit)) q.pro)
|
||||
--
|
||||
--
|
||||
@ -8803,7 +8845,7 @@
|
||||
(kick [[[~ %iron who] [[(dint p.ovo) ~] p.ovo ~] q.ovo] ~])
|
||||
::
|
||||
++ kick :: complete loop
|
||||
|= mor=(list move)
|
||||
|= mor=(list muve)
|
||||
=| ova=(list ovum)
|
||||
=+ rom=mor
|
||||
|- ^- [p=(list ovum) q=(list ,[p=@tas q=vase])]
|
||||
@ -8820,7 +8862,7 @@
|
||||
=- $(mor (weld p.nyx t.mor), fan q.nyx)
|
||||
^= nyx
|
||||
=+ naf=fan
|
||||
|- ^- [p=(list move) q=_fan]
|
||||
|- ^- [p=(list muve) q=_fan]
|
||||
?~ naf [~ ~]
|
||||
?. =(i.i.q.i.mor p.i.naf)
|
||||
=+ tuh=$(naf t.naf)
|
||||
|
||||
@ -2390,6 +2390,7 @@
|
||||
++ moar ,[p=@ud q=@ud] :: normal change range
|
||||
++ moat ,[p=case q=case] :: change range
|
||||
++ mood ,[p=care q=case r=path] :: request in desk
|
||||
++ move ,[p=(unit writ) q=duct r=card] :: typeless move
|
||||
++ moth ,[p=meth q=math r=(unit octs)] :: http operation
|
||||
++ name ,[p=@t q=(unit ,@t) r=(unit ,@t) s=@t] :: first mid/nick last
|
||||
++ newt ?(%boot %kick %mess %slay %wake) :: lifecycle events
|
||||
@ -2592,6 +2593,39 @@
|
||||
== ::
|
||||
++ tube ,[p=@ta q=@ta r=@ta s=path] :: canonical path
|
||||
++ tutu ,* :: presumed type
|
||||
++ vane $_ :: kernel actor
|
||||
|+ [now=@da eny=@ sky=$+(* (unit))] :: activate
|
||||
^? |% ::
|
||||
++ beat :: update
|
||||
|= $: wru=(unit writ) :: calling identity
|
||||
pax=wire :: pretext
|
||||
hen=duct :: channel
|
||||
fav=card :: event
|
||||
== ::
|
||||
:- 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
|
||||
|= $: our=ship :: observer
|
||||
ren=@tas :: submode
|
||||
his=ship :: target
|
||||
syd=@tas :: project
|
||||
lot=coin :: version
|
||||
tyl=path :: location
|
||||
== ::
|
||||
*(unit) :: record
|
||||
++ stay *vase :: save state, new
|
||||
++ vern [_@ud _@ud] :: hoon/vane version
|
||||
-- ::
|
||||
++ wand (list ,[p=life q=ring r=acro]) :: old mace in action
|
||||
++ wund (list ,[p=life q=ring r=acru]) :: mace in action
|
||||
++ what :: logical identity
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
!:
|
||||
%- epic
|
||||
%- give
|
||||
|= [quy=quay own=@p *]
|
||||
^- manx
|
||||
:~ %html
|
||||
|
||||
Loading…
Reference in New Issue
Block a user