mirror of
https://github.com/urbit/shrub.git
synced 2024-12-12 10:29:01 +03:00
Merge branch 'nextbreach' of github.com:urbit/urbit into nextbreach
Conflicts: urb/urbit.pill
This commit is contained in:
C. Guy Yarvin
commit
2f00948780
@ -54,7 +54,8 @@
|
||||
|= [new=deed old=deed]
|
||||
^- ?
|
||||
=+ rac=(clan r.p.q.new)
|
||||
?& ?~ q.p.q.new
|
||||
?& =(r.new r.old) :: match fake
|
||||
?~ q.p.q.new
|
||||
?& =(r.p.q.old r.p.q.new)
|
||||
&(!=(%earl rac) =(p.p.q.old (dec p.p.q.new)))
|
||||
==
|
||||
@ -78,11 +79,12 @@
|
||||
?. =(i.wal i.ouf) ouf
|
||||
$(wal t.wal, ouf t.ouf)
|
||||
::
|
||||
++ pier :: initial deed
|
||||
++ pier !: :: initial deed
|
||||
|= wed=deed
|
||||
^- &
|
||||
?> =+ rac=(clan r.p.q.wed)
|
||||
=+ loy=(haul r.q.wed)
|
||||
?: &(r.wed =(rac %czar)) %&
|
||||
?> =(0 p.p.q.wed)
|
||||
?> =(fig:ex:loy ?+(rac !! %czar (zeno r.p.q.wed), %pawn r.p.q.wed))
|
||||
?> =((shaf %self (sham q.wed)) (need (sure:as:loy *code p.wed)))
|
||||
@ -445,7 +447,7 @@
|
||||
?. =(pub r.q.i.lew.wod.u.rad) [~ +>.$]
|
||||
[[~ lew.wod.u.rad] +>.$]
|
||||
=+ syp=[[0 [~ p.nes] her now] ges pub]
|
||||
=+ ded=[(sign:as:q.nes *code (shaf %meld (sham syp))) syp]
|
||||
=+ ded=[(sign:as:q.nes *code (shaf %meld (sham syp))) syp fak.ton]
|
||||
=+ wil=[ded law.saf]
|
||||
?> =(wil (grip wil ~))
|
||||
:- [~ wil]
|
||||
@ -456,6 +458,7 @@
|
||||
++ cluy :: cluy:lax:as:go
|
||||
^- [p=life q=gens r=acru] :: client crypto
|
||||
?~ lew.wod.dur !!
|
||||
?. =(fak.ton r.i.lew.wod.dur) ~|([%client-wrong-fake her] !!)
|
||||
:+ p.p.q.i.lew.wod.dur
|
||||
q.q.i.lew.wod.dur
|
||||
(haul r.q.i.lew.wod.dur)
|
||||
@ -696,7 +699,7 @@
|
||||
?:((lth her 256) ~ $(her (sein her)))
|
||||
-- :: --as:go
|
||||
::
|
||||
++ ha :: adopt new license
|
||||
++ ha !: :: adopt new license
|
||||
|= [our=ship mac=mace wil=will]
|
||||
^- toun
|
||||
?> !=(~ mac)
|
||||
@ -705,6 +708,7 @@
|
||||
?> =(wil (grip wil ~))
|
||||
?> (real mac wil)
|
||||
%_ ton
|
||||
fak r.i.wil
|
||||
urb
|
||||
%+ ~(put by urb.ton)
|
||||
our
|
||||
@ -965,7 +969,7 @@
|
||||
==
|
||||
==
|
||||
++ come :: come:am
|
||||
|= [ges=(unit ,@t) wid=@ bur=@] :: instantiate pawn
|
||||
|= [ges=(unit ,@t) wid=@ bur=@ fak=?] :: instantiate pawn
|
||||
^- [p=[p=ship q=@uvG] q=furt]
|
||||
=+ loy=(bruw wid bur)
|
||||
=+ rig=sec:ex:loy
|
||||
@ -977,20 +981,24 @@
|
||||
%^ ~(ha go ton.fox)
|
||||
our
|
||||
`mace`[[0 rig] ~]
|
||||
`will`[[(sign:as:loy _@ (shaf %self (sham syp))) syp] ~]
|
||||
`will`[[(sign:as:loy _@ (shaf %self (sham syp))) syp fak] ~]
|
||||
fak.ton
|
||||
fak
|
||||
==
|
||||
::
|
||||
++ czar :: czar:am
|
||||
|= [our=ship ger=@uw] :: instantiate emperor
|
||||
++ czar !: :: czar:am
|
||||
|= [our=ship ger=@uw fak=?] :: instantiate emperor
|
||||
^- [p=(list boon) q=furt]
|
||||
=+ loy=(bruw 2.048 ger)
|
||||
?> =(fig:ex:loy (zeno our))
|
||||
=+ loy=?:(fak (bruw 2.048 our) (bruw 2.048 ger)) :: fake uses carrier #
|
||||
=+ fim==(fig:ex:loy (zeno our))
|
||||
?: &(!fak !fim) !! :: not fake & bad fig
|
||||
=+ mac=`mace`[[0 sec:ex:loy] ~]
|
||||
=+ syp=`step`[`bray`[0 ~ our now] [%en %czar ~] pub:ex:loy]
|
||||
=+ ded=`deed`[(sign:as:loy _@ (shaf %self (sham syp))) syp]
|
||||
=+ ded=`deed`[(sign:as:loy _@ (shaf %self (sham syp))) syp fak]
|
||||
=+ buq=`buck`[mac [ded ~]]
|
||||
=: ton.fox (~(ha go ton.fox) our buq)
|
||||
zac.fox (~(put by zac.fox) our *corn)
|
||||
fak.ton.fox fak
|
||||
==
|
||||
[[[%beer our pac:ex:loy] ~] fox]
|
||||
::
|
||||
@ -1639,11 +1647,11 @@
|
||||
(~(kick am [now fox(hop p.fav)]) hen)
|
||||
::
|
||||
%make
|
||||
=+ vun=(~(come am [now fox]) p.fav (bex q.fav) r.fav)
|
||||
=+ vun=(~(come am [now fox]) p.fav (bex q.fav) r.fav s.fav)
|
||||
[[[%beer p.vun] ~] q.vun]
|
||||
::
|
||||
%sith
|
||||
(~(czar am [now fox]) p.fav q.fav)
|
||||
(~(czar am [now fox]) p.fav q.fav r.fav)
|
||||
::
|
||||
%want
|
||||
(~(wise am [now fox]) p.fav hen q.fav r.fav)
|
||||
|
||||
@ -1231,7 +1231,6 @@
|
||||
`p.q.hin
|
||||
`(min p.q.hin u.big)
|
||||
=+ bos=(sein p.q.hin)
|
||||
=. bos ?.(=(bos p.q.hin) bos ~zod)
|
||||
:- :- [hen [%give q.hin]]
|
||||
?: =(bos p.q.hin) ~
|
||||
:_ ~
|
||||
@ -1250,7 +1249,6 @@
|
||||
::
|
||||
%init
|
||||
=+ bos=(sein p.q.hin)
|
||||
=. bos ?.(=(bos p.q.hin) bos ~zod)
|
||||
:- :* [hen %give q.hin]
|
||||
[[[%b tea] hen] [%sick %hail ~]]
|
||||
?: =(bos p.q.hin) ~
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
!:
|
||||
::
|
||||
:: clay (4c), revision control
|
||||
::
|
||||
|= pit=vase
|
||||
|
||||
@ -2146,7 +2146,7 @@
|
||||
[%loin p=@p q=chum] :: name hashed-pass
|
||||
[%logo p=@] :: logout
|
||||
[%loot p=@tas q=path] :: request directory
|
||||
[%make p=(unit ,@t) q=@ud r=@] :: wild license
|
||||
[%make p=(unit ,@t) q=@ud r=@ s=?] :: wild license
|
||||
[%mean p=ship q=term r=cuff s=vase] :: application event
|
||||
[%meta p=vase] :: meta-card
|
||||
[%meat p=ship q=card] :: concrete app action
|
||||
@ -2167,7 +2167,7 @@
|
||||
[%save p=path q=@] :: write atomic file
|
||||
[%send p=lane q=@] :: transmit packet
|
||||
[%show p=hasp q=(unit hope)] :: urbit subscribe
|
||||
[%sith p=@p q=@uw] :: imperial generator
|
||||
[%sith p=@p q=@uw r=?] :: imperial generator
|
||||
[%soft p=*] :: untyped card
|
||||
[%sync ~] :: reset soft state
|
||||
[%talk p=tank] :: show on console
|
||||
@ -2240,7 +2240,7 @@
|
||||
$: p=(unit (set monk)) :: readers
|
||||
q=(set monk) :: authors
|
||||
== ::
|
||||
++ deed ,[p=@ q=step] :: signature, stage
|
||||
++ deed ,[p=@ q=step r=?] :: sig, stage, fake?
|
||||
++ dome :: project state
|
||||
$: ang=agon :: pedigree
|
||||
ank=ankh :: state
|
||||
@ -2647,6 +2647,7 @@
|
||||
$: lit=@ud :: imperial modulus
|
||||
any=@ :: entropy
|
||||
urb=(map ship sufi) :: all keys and routes
|
||||
fak=?
|
||||
== ::
|
||||
++ tube ,[p=@ta q=@ta r=@ta s=path] :: canonical path
|
||||
++ tutu ,* :: presumed type
|
||||
|
||||
Loading…
Reference in New Issue
Block a user