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

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

Browse Source
This commit is contained in:
Galen Wolfe-Pauly 2015-05-13 16:22:03 -07:00
commit df358f27c4
9 changed files with 37 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
base/ape/dojo/core.hook
View File

@ -715,13 +715,13 @@
== ==
-- --
:: ::
++ peer ++ peer-sole
|= [from pax=path] |= [from pax=path]
^- (quip move +>) ^- (quip move +>)
~? !=(src our.hid) [%dojo-peer-stranger ost src pax] ~? !=(src our.hid) [%dojo-peer-stranger ost src pax]
:: ?> =(src our.hid) :: ?> =(src our.hid)
?< (~(has by hoc) ost) ?< (~(has by hoc) ost)
?> =(/sole pax) ?> =(~ pax)
=< he-abet =< he-abet
%~ he-peer he %~ he-peer he
:- [ost ~] :- [ost ~]

10
base/ape/hood/core.hook
View File

@ -76,11 +76,11 @@
|= [from hood-merge] |= [from hood-merge]
(ably (poke-merge:(kiln-work [hid +<-] (able %kiln)) +<+)) (ably (poke-merge:(kiln-work [hid +<-] (able %kiln)) +<+))
:: ::
++ poke-hood-sync :: ++ poke-hood-sync ::
|= [from hood-sync] |= [from hood-sync]
(ably (poke-sync:(kiln-work [hid +<-] (able %kiln)) +<+)) (ably (poke-sync:(kiln-work [hid +<-] (able %kiln)) +<+))
:: ::
++ poke-hood-unix :: ++ poke-hood-unix ::
|= [from hood-unix] |= [from hood-unix]
(ably (poke-unix:(kiln-work [hid +<-] (able %kiln)) +<+)) (ably (poke-unix:(kiln-work [hid +<-] (able %kiln)) +<+))
:: ::
@ -100,8 +100,12 @@
|= [then saw=(unit tang)] |= [then saw=(unit tang)]
(ably (take-coup-fancy:(kiln-work [hid ost src] (able %kiln)) way +<+)) (ably (take-coup-fancy:(kiln-work [hid ost src] (able %kiln)) way +<+))
:: ::
++ coup-kiln-spam ++ coup-kiln-spam ::
|= [then saw=(unit tang)] |= [then saw=(unit tang)]
~? ?=(^ saw) [%kiln-spam-lame u.saw] ~? ?=(^ saw) [%kiln-spam-lame u.saw]
[~ +>] [~ +>]
::
++ went-helm ::
|= [then her=ship kay=cape]
(ably (take-went:(helm-work [hid ost src] (able %helm)) way +<+))
-- --

2
base/ape/talk/core.hook
View File

@ -1714,7 +1714,7 @@
ra-abet:(~(ra-quit ra ost ~) man cuz) ra-abet:(~(ra-quit ra ost ~) man cuz)
:: ::
++ pull :: ++ pull ::
|= [from ~] |= [from *]
^- [(list move) _+>] ^- [(list move) _+>]
:: ~& [%talk-pull `*`ost] :: ~& [%talk-pull `*`ost]
=^ moz +>.$ ra-abet:ra-ever:~(ra-cancel ra ost ~) =^ moz +>.$ ra-abet:ra-ever:~(ra-cancel ra ost ~)

8
base/arvo/ames.hoon
View File

@ -454,7 +454,9 @@
^- [(unit will) _+>] ^- [(unit will) _+>]
?. =(our (sein her)) [~ +>.$] ?. =(our (sein her)) [~ +>.$]
=+ nes=sen =+ nes=sen
?. =(tic (end 6 1 (shaf %tick (mix her (shax sec:ex:q.nes))))) =+ ryt=(end 6 1 (shaf %tick (mix her (shax sec:ex:q.nes))))
?. =(tic ryt)
~& [%ames-wrong-ticket `@p`ryt]
[~ +>.$] [~ +>.$]
=+ rad=(~(get by hoc.saf) her) =+ rad=(~(get by hoc.saf) her)
?^ rad ?^ rad
@ -1671,7 +1673,7 @@
:+ (scot %p p.p.bon) :+ (scot %p p.p.bon)
(scot %p q.p.bon) (scot %p q.p.bon)
q.q.bon q.q.bon
[hen %pass pax %g %rote p.bon /helm 0 %m %will wil]~ [hen %pass pax %g %rote p.bon /hood 0 %m %will wil]~
?> ?=([@ @ *] t.q.q.bon) ?> ?=([@ @ *] t.q.q.bon)
:_ fox :_ fox
=+ [cak=i.t.q.q.bon ven=i.t.t.q.q.bon] =+ [cak=i.t.q.q.bon ven=i.t.t.q.q.bon]
@ -1724,7 +1726,7 @@
== ==
:: ::
%ye :: %ye %ye :: %ye
:: ~& [%ye bon] :: ~& [%ye bon]
?> =(p.p.bon (sein q.p.bon)) ?> =(p.p.bon (sein q.p.bon))
=+ ^= paz ^- (list ,@p) =+ ^= paz ^- (list ,@p)
%+ skim pals:(~(um am [now fox]) p.p.bon) %+ skim pals:(~(um am [now fox]) p.p.bon)

7
base/arvo/clay.hoon
View File

@ -727,8 +727,11 @@
[%done ~ %null !>(~)] [%done ~ %null !>(~)]
=+ (~(get by mim.u.dok) a) =+ (~(get by mim.u.dok) a)
?^ - [%done ~ %mime !>(u.-)] ?^ - [%done ~ %mime !>(u.-)]
:^ %cast %mime %done :- ~ :+ %cast %mime
(need (read:ze %x [%ud let.dom] a)) =+ (need (need (read-x:ze let.dom a)))
?: ?=(%& -<)
[%done ~ p.-]
(lobe-to-silk:ze a p.-)
== ==
== ==
:: ::

2
base/arvo/dill.hoon
View File

@ -325,7 +325,7 @@
=+ ^= flo ^- (list (pair ship term)) =+ ^= flo ^- (list (pair ship term))
=+ myr=(clan p.q.hic) =+ myr=(clan p.q.hic)
?: =(%pawn myr) ?: =(%pawn myr)
[[p.q.hic %dojo] ~] [[p.q.hic %dojo] [p.q.hic %hood] ~]
?: =(%earl myr) ?: =(%earl myr)
=+ fap=(sein p.q.hic) =+ fap=(sein p.q.hic)
[[fap %dojo] [fap %talk] [fap %hood] ~] [[fap %dojo] [fap %talk] [fap %hood] ~]

2
base/arvo/gall.hoon
View File

@ -989,7 +989,7 @@
[~ ..^$(pol.all (~(put by pol.all) p.q.hic [hen ~ ~ ~]))] [~ ..^$(pol.all (~(put by pol.all) p.q.hic [hen ~ ~ ~]))]
:: ::
%rote %rote
:: ~& [%gall-rote p.q.hic] ~& [%gall-rote p.q.hic]
?. (~(has by pol.all) p.p.q.hic) ?. (~(has by pol.all) p.p.q.hic)
~& [%gall-not-ours p.q.hic] ~& [%gall-not-ours p.q.hic]
[~ ..^$] [~ ..^$]

30
base/lib/helm/core.hook
View File

@ -45,24 +45,15 @@
|% :: helm library |% :: helm library
++ helm-work :: work in helm ++ helm-work :: work in helm
|= [[hide from] helm-part] |= [[hide from] helm-part]
?> =(src our)
=+ sez=(fall (~(get by hoc) ost) *helm-session) =+ sez=(fall (~(get by hoc) ost) *helm-session)
=> |% :: arvo structures => |% :: arvo structures
++ card :: ++ card ::
$% [%cash wire p=@p q=buck] :: $% [%cash wire p=@p q=buck] ::
[%conf wire dock %load ship term] :: [%conf wire dock %load ship term] ::
[%flog wire dill] :: [%flog wire flog] ::
[%plug wire @p @tas @p @tas] :: [%plug wire @p @tas @p @tas] ::
[%want wire sock path *] :: send message [%want wire sock path *] :: send message
== :: == ::
++ suss ,[term @tas @da] :: config report
++ dill :: sent to %dill
$% [%crud p=term q=(list tank)] :: fat report
[%text p=tape] :: thin report
[%veer p=@ta q=path r=@t] :: install vane
[%vega p=path] :: reboot by path
[%verb ~] :: verbose mode
== ::
++ move (pair bone card) :: user-level move ++ move (pair bone card) :: user-level move
-- --
|_ moz=(list move) |_ moz=(list move)
@ -81,7 +72,7 @@
=+ buz=(shax :(mix (jam ges) eny)) =+ buz=(shax :(mix (jam ges) eny))
=+ loy=(bruw 2.048 buz) =+ loy=(bruw 2.048 buz)
%- emit(bur `[his [0 sec:ex:loy]~]) %- emit(bur `[his [0 sec:ex:loy]~])
[%want /ticketing [our (sein his)] /q/ta his tic ges pub:ex:loy] [%want /helm/ticket [our (sein his)] /q/ta his tic ges pub:ex:loy]
:: ::
++ poke-init :: initialize ++ poke-init :: initialize
|= him=ship =< abet |= him=ship =< abet
@ -135,26 +126,31 @@
[%flog /reset %veer p way txt] [%flog /reset %veer p way txt]
:: ::
++ poke-will :: hear certificate ++ poke-will :: hear certificate
|= wil=(unit will) =< abet |= wil=(unit will)
?> ?=(^ bur) ?> ?=(^ bur)
?> ?=(^ wil) ?> ?=(^ wil)
=< abet
%- emil(bur ~) %- emil(bur ~)
~& [%poke-will wil]
:~ [%cash /helm p.u.bur q.u.bur u.wil] :~ [%cash /helm p.u.bur q.u.bur u.wil]
[%plug /helm our %main (sein our) %main] [%plug /helm our %home (sein our) %kids]
[%plug /helm our %arvo (sein our) %arvo]
[%plug /helm our %try (sein our) %try]
== ==
:: ::
++ poke-verb ++ poke-verb :: toggle verbose
|= ~ =< abet |= ~ =< abet
(emit %flog /helm %verb ~) (emit %flog /helm %verb ~)
:: ::
++ take-onto :: result of %conf ++ take-onto :: result of %conf
|= saw=(each suss tang) =< abet |= saw=(each suss tang) =< abet
~& [%take-onto saw]
%- emit %- emit
?- -.saw ?- -.saw
%| [%flog ~ %crud %onto `tang`p.saw] %| [%flog ~ %crud %onto `tang`p.saw]
%& [%flog ~ %text "<{<p.saw>}>"] %& [%flog ~ %text "<{<p.saw>}>"]
== ==
::
++ take-went :: result of %want
|= [way=path her=ship kay=cape] =< abet
(emit %flog ~ %text "went: {<[way kay]>}")
-- --
-- --

4
base/lib/kiln/core.hook
View File

@ -151,11 +151,11 @@
^+ . ^+ .
(blab [ost %merg /kiln/[syd] our syd her sud gem] ~) (blab [ost %merg /kiln/[syd] our syd her sud gem] ~)
:: ::
++ fancy-merge :: send to self ++ fancy-merge :: send to self
|= [syd=desk her=@p sud=desk gem=?(%auto germ)] |= [syd=desk her=@p sud=desk gem=?(%auto germ)]
^+ +> ^+ +>
%- blab :_ ~ %- blab :_ ~
[ost %poke /kiln/fancy/[^syd] [our %kiln] %hood-merge [syd her sud gem]] [ost %poke /kiln/fancy/[^syd] [our %hood] %hood-merge [syd her sud gem]]
:: ::
++ spam ++ spam
|= mes=(list tank) |= mes=(list tank)