urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-12 18:48:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'nextbreach' of github.com:urbit/urbit into nextbreach

Browse Source 
Conflicts:
	urb/urbit.pill
This commit is contained in:
C. Guy Yarvin 2014-06-04 03:44:33 -07:00
commit 2f00948780
4 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
arvo/ames.hoon
View File

@ -54,7 +54,8 @@
|= [new=deed old=deed] |= [new=deed old=deed]
^- ? ^- ?
=+ rac=(clan r.p.q.new) =+ 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) ?& =(r.p.q.old r.p.q.new)
&(!=(%earl rac) =(p.p.q.old (dec p.p.q.new))) &(!=(%earl rac) =(p.p.q.old (dec p.p.q.new)))
== ==
@ -78,11 +79,12 @@
?. =(i.wal i.ouf) ouf ?. =(i.wal i.ouf) ouf
$(wal t.wal, ouf t.ouf) $(wal t.wal, ouf t.ouf)
:: ::
++ pier :: initial deed ++ pier !: :: initial deed
|= wed=deed |= wed=deed
^- & ^- &
?> =+ rac=(clan r.p.q.wed) ?> =+ rac=(clan r.p.q.wed)
=+ loy=(haul r.q.wed) =+ loy=(haul r.q.wed)
?: &(r.wed =(rac %czar)) %&
?> =(0 p.p.q.wed) ?> =(0 p.p.q.wed)
?> =(fig:ex:loy ?+(rac !! %czar (zeno r.p.q.wed), %pawn r.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))) ?> =((shaf %self (sham q.wed)) (need (sure:as:loy *code p.wed)))
@ -445,7 +447,7 @@
?. =(pub r.q.i.lew.wod.u.rad) [~ +>.$] ?. =(pub r.q.i.lew.wod.u.rad) [~ +>.$]
[[~ lew.wod.u.rad] +>.$] [[~ lew.wod.u.rad] +>.$]
=+ syp=[[0 [~ p.nes] her now] ges pub] =+ 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=[ded law.saf]
?> =(wil (grip wil ~)) ?> =(wil (grip wil ~))
:- [~ wil] :- [~ wil]
@ -456,6 +458,7 @@
++ cluy :: cluy:lax:as:go ++ cluy :: cluy:lax:as:go
^- [p=life q=gens r=acru] :: client crypto ^- [p=life q=gens r=acru] :: client crypto
?~ lew.wod.dur !! ?~ lew.wod.dur !!
?. =(fak.ton r.i.lew.wod.dur) ~|([%client-wrong-fake her] !!)
:+ p.p.q.i.lew.wod.dur :+ p.p.q.i.lew.wod.dur
q.q.i.lew.wod.dur q.q.i.lew.wod.dur
(haul r.q.i.lew.wod.dur) (haul r.q.i.lew.wod.dur)
@ -696,7 +699,7 @@
?:((lth her 256) ~ $(her (sein her))) ?:((lth her 256) ~ $(her (sein her)))
-- :: --as:go -- :: --as:go
:: ::
++ ha :: adopt new license ++ ha !: :: adopt new license
|= [our=ship mac=mace wil=will] |= [our=ship mac=mace wil=will]
^- toun ^- toun
?> !=(~ mac) ?> !=(~ mac)
@ -705,6 +708,7 @@
?> =(wil (grip wil ~)) ?> =(wil (grip wil ~))
?> (real mac wil) ?> (real mac wil)
%_ ton %_ ton
fak r.i.wil
urb urb
%+ ~(put by urb.ton) %+ ~(put by urb.ton)
our our
@ -965,7 +969,7 @@
== ==
== ==
++ come :: come:am ++ 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] ^- [p=[p=ship q=@uvG] q=furt]
=+ loy=(bruw wid bur) =+ loy=(bruw wid bur)
=+ rig=sec:ex:loy =+ rig=sec:ex:loy
@ -977,20 +981,24 @@
%^ ~(ha go ton.fox) %^ ~(ha go ton.fox)
our our
`mace`[[0 rig] ~] `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 ++ czar !: :: czar:am
|= [our=ship ger=@uw] :: instantiate emperor |= [our=ship ger=@uw fak=?] :: instantiate emperor
^- [p=(list boon) q=furt] ^- [p=(list boon) q=furt]
=+ loy=(bruw 2.048 ger) =+ loy=?:(fak (bruw 2.048 our) (bruw 2.048 ger)) :: fake uses carrier #
?> =(fig:ex:loy (zeno our)) =+ fim==(fig:ex:loy (zeno our))
?: &(!fak !fim) !! :: not fake & bad fig
=+ mac=`mace`[[0 sec:ex:loy] ~] =+ mac=`mace`[[0 sec:ex:loy] ~]
=+ syp=`step`[`bray`[0 ~ our now] [%en %czar ~] pub: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 ~]] =+ buq=`buck`[mac [ded ~]]
=: ton.fox (~(ha go ton.fox) our buq) =: ton.fox (~(ha go ton.fox) our buq)
zac.fox (~(put by zac.fox) our *corn) zac.fox (~(put by zac.fox) our *corn)
fak.ton.fox fak
== ==
[[[%beer our pac:ex:loy] ~] fox] [[[%beer our pac:ex:loy] ~] fox]
:: ::
@ -1639,11 +1647,11 @@
(~(kick am [now fox(hop p.fav)]) hen) (~(kick am [now fox(hop p.fav)]) hen)
:: ::
%make %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] [[[%beer p.vun] ~] q.vun]
:: ::
%sith %sith
(~(czar am [now fox]) p.fav q.fav) (~(czar am [now fox]) p.fav q.fav r.fav)
:: ::
%want %want
(~(wise am [now fox]) p.fav hen q.fav r.fav) (~(wise am [now fox]) p.fav hen q.fav r.fav)

2
arvo/batz.hoon
View File

@ -1231,7 +1231,6 @@
`p.q.hin `p.q.hin
`(min p.q.hin u.big) `(min p.q.hin u.big)
=+ bos=(sein p.q.hin) =+ bos=(sein p.q.hin)
=. bos ?.(=(bos p.q.hin) bos ~zod)
:- :- [hen [%give q.hin]] :- :- [hen [%give q.hin]]
?: =(bos p.q.hin) ~ ?: =(bos p.q.hin) ~
:_ ~ :_ ~
@ -1250,7 +1249,6 @@
:: ::
%init %init
=+ bos=(sein p.q.hin) =+ bos=(sein p.q.hin)
=. bos ?.(=(bos p.q.hin) bos ~zod)
:- :* [hen %give q.hin] :- :* [hen %give q.hin]
[[[%b tea] hen] [%sick %hail ~]] [[[%b tea] hen] [%sick %hail ~]]
?: =(bos p.q.hin) ~ ?: =(bos p.q.hin) ~

2
arvo/clay.hoon
View File

@ -1,4 +1,4 @@
!: ::
:: clay (4c), revision control :: clay (4c), revision control
:: ::
|= pit=vase |= pit=vase

7
arvo/zuse.hoon
View File

@ -2146,7 +2146,7 @@
[%loin p=@p q=chum] :: name hashed-pass [%loin p=@p q=chum] :: name hashed-pass
[%logo p=@] :: logout [%logo p=@] :: logout
[%loot p=@tas q=path] :: request directory [%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 [%mean p=ship q=term r=cuff s=vase] :: application event
[%meta p=vase] :: meta-card [%meta p=vase] :: meta-card
[%meat p=ship q=card] :: concrete app action [%meat p=ship q=card] :: concrete app action
@ -2167,7 +2167,7 @@
[%save p=path q=@] :: write atomic file [%save p=path q=@] :: write atomic file
[%send p=lane q=@] :: transmit packet [%send p=lane q=@] :: transmit packet
[%show p=hasp q=(unit hope)] :: urbit subscribe [%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 [%soft p=*] :: untyped card
[%sync ~] :: reset soft state [%sync ~] :: reset soft state
[%talk p=tank] :: show on console [%talk p=tank] :: show on console
@ -2240,7 +2240,7 @@
$: p=(unit (set monk)) :: readers $: p=(unit (set monk)) :: readers
q=(set monk) :: authors q=(set monk) :: authors
== :: == ::
++ deed ,[p=@ q=step] :: signature, stage ++ deed ,[p=@ q=step r=?] :: sig, stage, fake?
++ dome :: project state ++ dome :: project state
$: ang=agon :: pedigree $: ang=agon :: pedigree
ank=ankh :: state ank=ankh :: state
@ -2647,6 +2647,7 @@
$: lit=@ud :: imperial modulus $: lit=@ud :: imperial modulus
any=@ :: entropy any=@ :: entropy
urb=(map ship sufi) :: all keys and routes urb=(map ship sufi) :: all keys and routes
fak=?
== :: == ::
++ tube ,[p=@ta q=@ta r=@ta s=path] :: canonical path ++ tube ,[p=@ta q=@ta r=@ta s=path] :: canonical path
++ tutu ,* :: presumed type ++ tutu ,* :: presumed type