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

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

Browse Source 
Conflicts:
	urb/urbit.pill
This commit is contained in:
Anton Dyudin 2015-01-22 14:16:19 -08:00
commit ac1552ee69
6 changed files with 54 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arvo/eyre.hoon
View File

@ -46,6 +46,7 @@
$% [%mess p=hapt q=ship r=cage] :: $% [%mess p=hapt q=ship r=cage] ::
[%nuke p=hapt q=ship] :: [%nuke p=hapt q=ship] ::
[%show p=hapt q=ship r=path] :: [%show p=hapt q=ship r=path] ::
[%took p=hapt q=ship] ::
== == :: == == ::
$: %t :: to %temp $: %t :: to %temp
$% [%wait p=@da] :: $% [%wait p=@da] ::
@ -407,6 +408,8 @@
?> ?=(%show i.mab) ?> ?=(%show i.mab)
=+ can=(slav %ud i.t.mab) =+ can=(slav %ud i.t.mab)
=+ sem=(need (~(get by can.sub.siq:beat:u.ouy) can)) =+ sem=(need (~(get by can.sub.siq:beat:u.ouy) can))
=. mow.u.ouy
:_(mow.u.ouy [hen %pass tea [%g %took [- + ~]:hap.sem you.u.ouy]])
?: =(0 can) ?: =(0 can)
=< abet =< work =< abet =< abet =< work =< abet
?~ num.sem ?~ num.sem
@ -2052,7 +2055,7 @@
|= nap=@ud |= nap=@ud
=+ suy=(~(get by sok) nap) =+ suy=(~(get by sok) nap)
?~ suy ~ ?~ suy ~
(some ~(. yo nap u.suy)) (some ~(. yo nap=nap you=p.u.suy siq=q.u.suy))
:: ::
++ yo :: app instance ++ yo :: app instance
|_ $: nap=@ud :: instance number |_ $: nap=@ud :: instance number

12
arvo/gall.hoon
View File

@ -202,7 +202,9 @@
++ lump :: position ++ lump :: position
|= pax=path |= pax=path
^- [p=hapt q=path] ^- [p=hapt q=path]
?> ?=([@ @ *] pax) ?. ?=([@ @ *] pax)
~& [%lump-path-bad pax]
!!
:- :- (slav %p i.pax) :- :- (slav %p i.pax)
(need (pick i.t.pax)) (need (pick i.t.pax))
t.t.pax t.t.pax
@ -356,7 +358,7 @@
^- [(list move) _..^^$] ^- [(list move) _..^^$]
?> ?=(?(%mess %show %nuke %took) -.kon) ?> ?=(?(%mess %show %nuke %took) -.kon)
?: ?=(%took -.kon) ?: ?=(%took -.kon)
~& [%gape-took our imp hen] :: ~& [%gape-took our imp hen]
[~ ..^^$] [~ ..^^$]
=+ you=`ship`?-(-.kon %mess p.kon, %nuke p.kon, %show p.kon) =+ you=`ship`?-(-.kon %mess p.kon, %nuke p.kon, %show p.kon)
=+ mat=(~(got by pol.all) you) =+ mat=(~(got by pol.all) you)
@ -1160,9 +1162,9 @@
=+ qol=(~(get by qel.sat) ost) =+ qol=(~(get by qel.sat) ost)
:: ~& [%yawn-told-has qol [our hen]] :: ~& [%yawn-told-has qol [our hen]]
=+ qul=?~(qol 1 +(u.qol)) =+ qul=?~(qol 1 +(u.qol))
:: ?: =(10 qul) ?: =(10 qul)
:: ~& [%yawn-told-full our hen] ~& [%yawn-told-full our hen]
:: +>.$(qic.sat `[hen %nuke p.kon]) +>.$(qic.sat ~, vey.sat (~(put to vey.sat) hen %nuke p.kon))
+>.$(qic.sat ~, qel.sat (~(put by qel.sat) ost qul)) +>.$(qic.sat ~, qel.sat (~(put by qel.sat) ost qul))
:: ::
%load %load

134
main/app/rodeo/core.hook
View File

@ -157,7 +157,6 @@
:: ::
%review ra-ever:(ra-think | her +.cod) %review ra-ever:(ra-think | her +.cod)
%publish ra-ever:(ra-think & her +.cod) %publish ra-ever:(ra-think & her +.cod)
%ping (ra-notice her +.cod)
== ==
:: ::
++ ra-config :: configure story ++ ra-config :: configure story
@ -182,15 +181,6 @@
?~ pur ~& [%ra-stalk-none man] +>.$ ?~ pur ~& [%ra-stalk-none man] +>.$
pa-abet:(~(pa-stalk pa man u.pur) tay sih) pa-abet:(~(pa-stalk pa man u.pur) tay sih)
:: ::
++ ra-timer :: timeout
^+ .
=+ paz=stories
|- ^+ +>
?~ paz +>.$
=. +>.$ $(paz l.paz)
=. +>.$ $(paz r.paz)
pa-abet:~(pa-timer pa p.n.paz q.n.paz)
::
++ ra-twitter :: %twitter response ++ ra-twitter :: %twitter response
|= [met=twim sih=sign] |= [met=twim sih=sign]
^+ +> ^+ +>
@ -211,19 +201,24 @@
(ra-think | our.hid u.oot ~) (ra-think | our.hid u.oot ~)
:: ::
++ ra-cancel :: drop a bone ++ ra-cancel :: drop a bone
%_ . ^+ .
general (~(del in general) ost) =+ hap=(~(got by sup.hid) ost)
stories ~& [%ra-cancel ost hap]
|- ^- (map span story) ?> ?=([@ @ *] q.hap)
?~ stories ~ =* man i.t.q.hap
:- :- p.n.stories =+ pur=(~(get by stories) man)
%= q.n.stories ?~ pur +>
guests (~(del by guests.q.n.stories) ost) pa-abet:pa-cancel:(~(pa-notify pa man u.pur) p.hap %gone *human)
viewers (~(del in viewers.q.n.stories) ost) ::
owners (~(del in owners.q.n.stories) ost) ++ ra-human :: look up person
== |= her=ship
[$(stories l.stories) $(stories r.stories)] ^- [human _+>]
== =^ who folks
=+ who=(~(get by folks) her)
?^ who [u.who folks]
=+ who=`human`[~ `(scot %p her)] :: XX do right
[who (~(put by folks) her who)]
[who +>.$]
:: ::
++ ra-subscribe :: listen to ++ ra-subscribe :: listen to
|= [her=ship pax=path] |= [her=ship pax=path]
@ -246,7 +241,8 @@
=. soy ?.((~(has in vab) %a) soy (pa-watch:soy her)) =. soy ?.((~(has in vab) %a) soy (pa-watch:soy her))
=. soy ?.((~(has in vab) %x) soy (pa-master:soy her)) =. soy ?.((~(has in vab) %x) soy (pa-master:soy her))
=. soy ?.((~(has in vab) %f) soy (pa-listen:soy her t.t.pax)) =. soy ?.((~(has in vab) %f) soy (pa-listen:soy her t.t.pax))
pa-abet:soy =^ who +>.$ (ra-human her)
pa-abet:(pa-notify:soy her %hear who)
:: ::
++ ra-think :: publish/review ++ ra-think :: publish/review
|= [pub=? her=ship tiz=(list thought)] |= [pub=? her=ship tiz=(list thought)]
@ -261,47 +257,6 @@
?~ aud +>.^$ ?~ aud +>.^$
$(aud t.aud, +>.^$ (ra-conduct pub her p.i.aud tip)) $(aud t.aud, +>.^$ (ra-conduct pub her p.i.aud tip))
:: ::
++ ra-notice :: declare presence
|= [her=ship vig=(map station presence)]
^+ +>
=+ sul=(~(tap by vig) ~)
|- ^+ +>.^$
?~ sul ra-ever
=. +>.^$ $(sul t.sul)
?- -.p.i.sul
%| +>.^$
%& ?: =(`ship`p.p.p.i.sul our.hid)
(ra-appear her q.p.p.i.sul q.i.sul)
?: =(her our.hid)
(ra-provoke p.p.p.i.sul i.sul)
(ra-evil %rodeo-unauthorized-presence)
==
::
++ ra-appear :: review presence
|= [her=ship man=span per=presence]
=^ who folks
=+ who=(~(get by folks) her)
?^ who [u.who folks]
=+ who=`human`[~ `(scot %p her)] :: XX do right
[who (~(put by folks) her who)]
=+ pur=(~(get by stories) man)
?~ pur
~& [%bad-appear man]
(ra-evil %rodeo-no-story)
pa-abet:(~(pa-notify pa man u.pur) her per who)
::
++ ra-provoke :: forward presence
|= [him=ship tay=station per=presence]
%+ ra-emit ost
:* %pass
/provoke
%g
%mess
[him /rodeo]
our.hid
[%rodeo-command !>(`command`[%ping [[tay per] ~ ~]])]
==
::
++ ra-conduct :: thought to station ++ ra-conduct :: thought to station
|= [pub=? her=ship tay=station tip=thought] |= [pub=? her=ship tay=station tip=thought]
^+ +> ^+ +>
@ -362,17 +317,6 @@
::== ::==
& &
:: ::
++ pa-timer :: timer expire
^+ .
=+ cul=(~(tap by locals) ~)
=+ ^= hay
%+ skim cul
|= [a=ship b=@da c=status]
(lte lat.hid (add ~m2 b))
?: =(cul hay) +>
%. viewers
pa-display(locals (~(gas by *(map ship (pair ,@da status))) hay))
::
++ pa-watch :: watch presence ++ pa-watch :: watch presence
|= her=ship |= her=ship
?. (pa-admire her) ?. (pa-admire her)
@ -400,6 +344,7 @@
?~ vew +>.^$ ?~ vew +>.^$
=. +>.^$ $(vew l.vew) =. +>.^$ $(vew l.vew)
=. +>.^$ $(vew r.vew) =. +>.^$ $(vew r.vew)
~& [%pa-display n.vew]
(pa-sauce n.vew [[%rush %rodeo-report %group reg] ~]) (pa-sauce n.vew [[%rush %rodeo-report %group reg] ~])
:: ::
++ pa-monitor :: update config ++ pa-monitor :: update config
@ -491,7 +436,7 @@
%| ~& tweet-acquire/p.p.tay %| ~& tweet-acquire/p.p.tay
!! !!
:: ::
%& ~& [%pa-acquire [our.hid man] [p.p.tay q.p.tay]] %& :: ~& [%pa-acquire [our.hid man] [p.p.tay q.p.tay]]
:~ :- /friend/show/(scot %p p.p.tay)/[man] :~ :- /friend/show/(scot %p p.p.tay)/[man]
[%g %show [p.p.tay /rodeo] our.hid /af/[q.p.tay]/(scot %ud num)] [%g %show [p.p.tay /rodeo] our.hid /af/[q.p.tay]/(scot %ud num)]
== ==
@ -510,19 +455,21 @@
pa-monitor pa-monitor
:: ::
++ pa-cancel :: unsubscribe from ++ pa-cancel :: unsubscribe from
^+ . %_ .
:: ~& [%pa-cancel ost] guests (~(del in guests) ost)
=. guests (~(del in guests) ost) viewers (~(del in viewers) ost)
(pa-sauce ost [[%mean ~] ~]) owners (~(del in owners) ost)
==
:: ::
++ pa-notify :: local presence ++ pa-notify :: local presence
|= [her=ship saz=status] |= [her=ship saz=status]
^+ +> ^+ +>
=+ guz=(~(get by locals) her) =+ ^= nol
=. locals (~(put by locals) her lat.hid saz) ?: =(%gone p.saz)
?. |(?=(~ guz) !=(saz q.u.guz)) (~(del by locals) p.saz)
+>.$ (~(put by locals) her lat.hid saz)
(pa-display viewers) ?: =(nol locals) +>.$
(pa-display(locals nol) viewers)
:: ::
++ pa-remind :: remote presence ++ pa-remind :: remote presence
|= [tay=station loc=atlas rem=(map station atlas)] |= [tay=station loc=atlas rem=(map station atlas)]
@ -554,7 +501,7 @@
++ pa-start :: start stream ++ pa-start :: start stream
|= riv=river |= riv=river
^+ +> ^+ +>
=- ~& [%pa-start riv lab] =- :: ~& [%pa-start riv lab]
=. +>.$ (pa-sauce ost [[%rush %rodeo-report %grams q.lab r.lab] ~]) =. +>.$ (pa-sauce ost [[%rush %rodeo-report %grams q.lab r.lab] ~])
?: p.lab ?: p.lab
(pa-sauce ost [[%mean ~] ~]) (pa-sauce ost [[%mean ~] ~])
@ -578,8 +525,6 @@
++ pa-listen :: subscribe ++ pa-listen :: subscribe
|= [her=ship pax=path] |= [her=ship pax=path]
^+ +> ^+ +>
=. +> (pa-watch her)
=. +> (pa-master her)
?. (pa-admire her) ?. (pa-admire her)
(pa-sauce ost [[%mean ~ %rodeo-listen-unauthorized ~] ~]) (pa-sauce ost [[%mean ~ %rodeo-listen-unauthorized ~] ~])
=+ ^= ruv ^- (unit river) =+ ^= ruv ^- (unit river)
@ -672,7 +617,8 @@
|= [ost=bone her=ship cod=command] |= [ost=bone her=ship cod=command]
^- [(list move) _+>] ^- [(list move) _+>]
:: ~& [%rodeo-poke-command her cod] :: ~& [%rodeo-poke-command her cod]
ra-abet:(~(ra-apply ra ost ~) her cod) =^ moz +>.$ ra-abet:(~(ra-apply ra ost ~) her cod)
[moz +>.$]
:: ::
++ pour ++ pour
|= [ost=bone pax=path sih=*] |= [ost=bone pax=path sih=*]
@ -681,12 +627,6 @@
=+ sih=((hard sign) sih) =+ sih=((hard sign) sih)
:: ~& [%rodeo-pour ost pax sih] :: ~& [%rodeo-pour ost pax sih]
?+ pax ~& [%rodeo-strange-path pax] !! ?+ pax ~& [%rodeo-strange-path pax] !!
::
[%provoke ~] [~ +>.$]
[%time ~]
?> ?=(0 ost)
=^ moz +>.$ ra-abet:~(ra-timer ra 0 ~)
:_(+>.$ :_(moz [0 %pass /time %t %wait (add ~s10 lat.hid)]))
:: ::
[%twitter *] [%twitter *]
=- ra-abet:(~(ra-twitter ra ost ~) met sih) =- ra-abet:(~(ra-twitter ra ost ~) met sih)
@ -736,7 +676,7 @@
|= old=(unit (unit house-any)) |= old=(unit (unit house-any))
^- [(list move) _+>] ^- [(list move) _+>]
?> ?=(^ old) ?> ?=(^ old)
=+ moz=`(list move)`[0 %pass /time %t %wait (add ~s10 lat.hid)]~ =| moz=(list move)
|- |-
?~ u.old ?~ u.old
=+ paf=/(scot %p our.hid)/try/(scot %da lat.hid)/rodeo/backlog/jam =+ paf=/(scot %p our.hid)/try/(scot %da lat.hid)/rodeo/backlog/jam

9
main/app/talk/core.hook
View File

@ -288,7 +288,7 @@
:~ %afx :~ %afx
man man
?: =(0 count) ?: =(0 count)
~& [%story-init man `@da`(sub lat.hid ~d1)] :: ~& [%story-init man `@da`(sub lat.hid ~d1)]
(scot %da (sub lat.hid ~d1)) (scot %da (sub lat.hid ~d1))
(scot %ud count) (scot %ud count)
== ==
@ -403,7 +403,7 @@
++ sy-grams :: apply telegrams ++ sy-grams :: apply telegrams
|= [num=@ud gaz=(list telegram)] |= [num=@ud gaz=(list telegram)]
^+ +> ^+ +>
~& [%sy-grams [num count] (lent gaz)] :: ~& [%sy-grams [num count] (lent gaz)]
?: (gth num count) ?: (gth num count)
(sy-message(count 0) "message gap: {<num>} at {<count>}") (sy-message(count 0) "message gap: {<num>} at {<count>}")
=. . =. .
@ -495,6 +495,7 @@
:: ::
++ sz-group :: apply register ++ sz-group :: apply register
|= rex=register |= rex=register
=. +>+> (sy-present "register" >rex< ~)
%_(+> am.big rex) %_(+> am.big rex)
:: ::
++ sz-apply :: apply report ++ sz-apply :: apply report
@ -607,7 +608,9 @@
%mean ~&([%pour-mean-cmd-in +>.sih] !!) %mean ~&([%pour-mean-cmd-in +>.sih] !!)
%rush %rush
?> ?=(%txt -.p.sih) ?> ?=(%txt -.p.sih)
(pour-shell p.p.sih) =^ moz +>.$ (pour-shell p.p.sih)
:_ +>.$
:_(moz [ost %pass pax %g %took [our.hid +.imp.hid] our.hid])
== ==
:: ::
%cmd-ac %cmd-ac

1
main/mar/rodeo-command/door.hook
View File

@ -16,7 +16,6 @@
=< :~ publish/(ar thot) =< :~ publish/(ar thot)
review/(ar thot) review/(ar thot)
design/(ot party/so config/(mu conf) ~) design/(ot party/so config/(mu conf) ~)
ping/auri
== ==
|% |%
++ op :: parse keys of map ++ op :: parse keys of map

1
main/sur/rodeo/core.hook
View File

@ -9,7 +9,6 @@
$% [%design (pair span (unit config))] :: configure/destroy $% [%design (pair span (unit config))] :: configure/destroy
[%publish (list thought)] :: originate [%publish (list thought)] :: originate
[%review (list thought)] :: deliver [%review (list thought)] :: deliver
[%ping (map station presence)] :: declare status
== :: == ::
++ config :: party configuration ++ config :: party configuration
$: sources=(set station) :: pulls from $: sources=(set station) :: pulls from