ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-11-28 19:55:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rename radio to rodeo.

Browse Source
This commit is contained in:
C. Guy Yarvin 2015-01-15 11:32:04 -08:00
parent b6c7b64d77
commit 6dfd825b9c
6 changed files with 81 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
main/app/radio/core.hook → main/app/rodeo/core.hook
View File

@ -1,9 +1,9 @@
:: ::
:::: /hook/core/radio/app :::: /hook/core/rodeo/app
:: ::
/? 314 /? 314
/- *radio /- *rodeo
/+ radio /+ rodeo
:: ::
:::: ::::
:: ::
@ -11,7 +11,7 @@
=> |% :: data structures => |% :: data structures
++ house ,[%1 house-1] :: full state ++ house ,[%1 house-1] :: full state
++ house-any :: app history ++ house-any :: app history
$% [%1 house-1] :: 1: radio $% [%1 house-1] :: 1: rodeo
[%0 house-0] :: 0: initial version [%0 house-0] :: 0: initial version
== :: == ::
++ house-1 :: ++ house-1 ::
@ -50,7 +50,7 @@
[%da p=@da] :: by date [%da p=@da] :: by date
== :: == ::
++ gift :: result ++ gift :: result
$% [%rust %radio-report report] :: refresh $% [%rust %rodeo-report report] :: refresh
[%mean ares] :: cancel [%mean ares] :: cancel
[%nice ~] :: accept [%nice ~] :: accept
== :: == ::
@ -61,7 +61,7 @@
$: %g :: application $: %g :: application
$% [%mean p=ares] :: cancel $% [%mean p=ares] :: cancel
[%nice ~] :: acknowledge [%nice ~] :: acknowledge
[%rust %radio-report report] :: refresh [%rust %rodeo-report report] :: refresh
== == :: == == ::
$: %t :: $: %t ::
$% [%wake ~] :: timer wakeup $% [%wake ~] :: timer wakeup
@ -116,7 +116,7 @@
++ ra-house :: emit stations ++ ra-house :: emit stations
|= ost=bone |= ost=bone
%+ ra-emit ost %+ ra-emit ost
:^ %give %rust %radio-report :^ %give %rust %rodeo-report
:- %house :- %house
%- ~(gas in *(set span)) %- ~(gas in *(set span))
^- (list span) ^- (list span)
@ -130,7 +130,7 @@
=. +> $(gel r.gel) =. +> $(gel r.gel)
(ra-house n.gel) (ra-house n.gel)
:: ::
++ ra-init :: initialize radio ++ ra-init :: initialize rodeo
=+ sir=(sein our.hid) =+ sir=(sein our.hid)
%+ ra-apply our.hid %+ ra-apply our.hid
:+ %design (main our.hid) :+ %design (main our.hid)
@ -145,10 +145,10 @@
?- -.cod ?- -.cod
%design %design
?. =(her our.hid) ?. =(her our.hid)
(ra-evil %radio-no-owner) (ra-evil %rodeo-no-owner)
?~ q.cod ?~ q.cod
?. (~(has by stories) p.cod) ?. (~(has by stories) p.cod)
(ra-evil %radio-no-story) (ra-evil %rodeo-no-story)
=. +>.$ (ra-config p.cod *config) =. +>.$ (ra-config p.cod *config)
ra-ever(stories (~(del by stories) p.cod)) ra-ever(stories (~(del by stories) p.cod))
=. +>.$ (ra-config p.cod u.q.cod) =. +>.$ (ra-config p.cod u.q.cod)
@ -204,7 +204,7 @@
%+ ~(put by q.u.oot) %+ ~(put by q.u.oot)
[%& her man] [%& her man]
?+ sih !! ?+ sih !!
[%g %mean *] ~&([%radio-repeat-rejected num her man sih] %rejected) [%g %mean *] ~&([%rodeo-repeat-rejected num her man sih] %rejected)
[%g %nice ~] %received [%g %nice ~] %received
== ==
(ra-think | our.hid u.oot ~) (ra-think | our.hid u.oot ~)
@ -231,7 +231,7 @@
?: ?=(~ pax) ?: ?=(~ pax)
(ra-house(general (~(put in general) ost)) ost) (ra-house(general (~(put in general) ost)) ost)
?. ?=([@ @ *] pax) ?. ?=([@ @ *] pax)
(ra-evil %radio-bad-path) (ra-evil %rodeo-bad-path)
=+ ^= vab ^- (set ,@tas) =+ ^= vab ^- (set ,@tas)
=| vab=(set ,@tas) =| vab=(set ,@tas)
|- ^+ vab |- ^+ vab
@ -240,7 +240,7 @@
=+ pur=(~(get by stories) i.t.pax) =+ pur=(~(get by stories) i.t.pax)
?~ pur ?~ pur
~& [%bad-subscribe-story-c i.t.pax] ~& [%bad-subscribe-story-c i.t.pax]
(ra-evil %radio-no-story) (ra-evil %rodeo-no-story)
=+ soy=~(. pa i.t.pax u.pur) =+ soy=~(. pa i.t.pax u.pur)
=. 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))
@ -273,7 +273,7 @@
(ra-appear her q.p.p.i.sul q.i.sul) (ra-appear her q.p.p.i.sul q.i.sul)
?: =(her our.hid) ?: =(her our.hid)
(ra-provoke p.p.p.i.sul i.sul) (ra-provoke p.p.p.i.sul i.sul)
(ra-evil %radio-unauthorized-presence) (ra-evil %rodeo-unauthorized-presence)
== ==
:: ::
++ ra-appear :: review presence ++ ra-appear :: review presence
@ -286,7 +286,7 @@
=+ pur=(~(get by stories) man) =+ pur=(~(get by stories) man)
?~ pur ?~ pur
~& [%bad-appear man] ~& [%bad-appear man]
(ra-evil %radio-no-story) (ra-evil %rodeo-no-story)
pa-abet:(~(pa-notify pa man u.pur) her per who) pa-abet:(~(pa-notify pa man u.pur) her per who)
:: ::
++ ra-provoke :: forward presence ++ ra-provoke :: forward presence
@ -296,9 +296,9 @@
/provoke /provoke
%g %g
%mess %mess
[him /radio] [him /rodeo]
our.hid our.hid
[%radio-command !>(`command`[%ping [[tay per] ~ ~]])] [%rodeo-command !>(`command`[%ping [[tay per] ~ ~]])]
== ==
:: ::
++ ra-conduct :: thought to station ++ ra-conduct :: thought to station
@ -338,9 +338,9 @@
/repeat/(scot %ud p.outbox)/(scot %p p.cuz)/[q.cuz] /repeat/(scot %ud p.outbox)/(scot %p p.cuz)/[q.cuz]
%g %g
%mess %mess
[p.cuz /radio] [p.cuz /rodeo]
our.hid our.hid
[%radio-command !>(`command`[%review tip ~])] [%rodeo-command !>(`command`[%review tip ~])]
== ==
+>(p.outbox +(p.outbox), q.outbox (~(put by q.outbox) p.outbox tip)) +>(p.outbox +(p.outbox), q.outbox (~(put by q.outbox) p.outbox tip))
:: ::
@ -375,17 +375,17 @@
++ pa-watch :: watch presence ++ pa-watch :: watch presence
|= her=ship |= her=ship
?. (pa-admire her) ?. (pa-admire her)
(pa-sauce ost [[%mean ~ %radio-watch-unauthorized ~] ~]) (pa-sauce ost [[%mean ~ %rodeo-watch-unauthorized ~] ~])
=. viewers (~(put in viewers) ost) =. viewers (~(put in viewers) ost)
(pa-display ost ~ ~) (pa-display ost ~ ~)
:: ::
++ pa-master :: hear config ++ pa-master :: hear config
|= her=ship |= her=ship
?. (pa-admire her) ?. (pa-admire her)
(pa-sauce ost [[%mean ~ %radio-master-unauthorized ~] ~]) (pa-sauce ost [[%mean ~ %rodeo-master-unauthorized ~] ~])
=. owners (~(put in owners) ost) =. owners (~(put in owners) ost)
:: ~& [%pa-master her man shape] :: ~& [%pa-master her man shape]
(pa-sauce ost [[%rust %radio-report %config shape] ~]) (pa-sauce ost [[%rust %rodeo-report %config shape] ~])
:: ::
++ pa-display :: update presence ++ pa-display :: update presence
|= vew=(set bone) |= vew=(set bone)
@ -399,7 +399,7 @@
?~ vew +>.^$ ?~ vew +>.^$
=. +>.^$ $(vew l.vew) =. +>.^$ $(vew l.vew)
=. +>.^$ $(vew r.vew) =. +>.^$ $(vew r.vew)
(pa-sauce n.vew [[%rust %radio-report %group reg] ~]) (pa-sauce n.vew [[%rust %rodeo-report %group reg] ~])
:: ::
++ pa-monitor :: update config ++ pa-monitor :: update config
=+ owe=owners =+ owe=owners
@ -408,19 +408,19 @@
=. +> $(owe l.owe) =. +> $(owe l.owe)
=. +> $(owe r.owe) =. +> $(owe r.owe)
:: ~& [%pa-monitor man shape] :: ~& [%pa-monitor man shape]
(pa-sauce n.owe [[%rust %radio-report %config shape] ~]) (pa-sauce n.owe [[%rust %rodeo-report %config shape] ~])
:: ::
++ pa-friend :: subscribed update ++ pa-friend :: subscribed update
|= sih=sign |= sih=sign
^+ +> ^+ +>
?+ sih ~&([%radio-bad-friend sih] !!) ?+ sih ~&([%rodeo-bad-friend sih] !!)
[%g %nice ~] [%g %nice ~]
:: ~& %pa-friend-nice :: ~& %pa-friend-nice
+>.$ +>.$
:: ::
[%g %rust %radio-report *] [%g %rust %rodeo-report *]
:: ~& [%pa-friend-report +>+.sih] :: ~& [%pa-friend-report +>+.sih]
?+ -.+>+.sih ~&([%radio-odd-friend sih] !!) ?+ -.+>+.sih ~&([%rodeo-odd-friend sih] !!)
%config +>.$ %config +>.$
%group +>.$ %group +>.$
%grams (pa-lesson q.+.+>+.sih) %grams (pa-lesson q.+.+>+.sih)
@ -430,13 +430,13 @@
++ pa-stalk :: subscribed present ++ pa-stalk :: subscribed present
|= [tay=station sih=sign] |= [tay=station sih=sign]
^+ +> ^+ +>
?+ sih ~&([%radio-bad-friend sih] !!) ?+ sih ~&([%rodeo-bad-friend sih] !!)
[%g %nice ~] [%g %nice ~]
:: ~& %pa-stalk-nice :: ~& %pa-stalk-nice
+>.$ +>.$
:: ::
[%g %rust %radio-report *] [%g %rust %rodeo-report *]
?+ -.+>+.sih ~&([%radio-odd-friend sih] !!) ?+ -.+>+.sih ~&([%rodeo-odd-friend sih] !!)
%group %group
(pa-remind tay +.+>+.sih) (pa-remind tay +.+>+.sih)
== ==
@ -468,9 +468,9 @@
:: ::
%& :: ~& [%pa-abjure [our.hid man] [p.p.tay q.p.tay]] %& :: ~& [%pa-abjure [our.hid man] [p.p.tay q.p.tay]]
:~ :- /friend/nuke/[man] :~ :- /friend/nuke/[man]
[%g %nuke [p.p.tay /radio] our.hid] [%g %nuke [p.p.tay /rodeo] our.hid]
:- /stalk/nuke/[man] :- /stalk/nuke/[man]
[%g %nuke [p.p.tay /radio] our.hid] [%g %nuke [p.p.tay /rodeo] our.hid]
== ==
== ==
:: ::
@ -488,7 +488,7 @@
:: ::
%& ~& [%pa-acquire [our.hid man] [p.p.tay q.p.tay]] %& ~& [%pa-acquire [our.hid man] [p.p.tay q.p.tay]]
:~ :- /friend/show/[man] :~ :- /friend/show/[man]
[%g %show [p.p.tay /radio] our.hid /af/[q.p.tay]/(scot %ud num)] [%g %show [p.p.tay /rodeo] our.hid /af/[q.p.tay]/(scot %ud num)]
== ==
== ==
:: ::
@ -549,7 +549,7 @@
++ pa-start :: start stream ++ pa-start :: start stream
|= riv=river |= riv=river
^+ +> ^+ +>
=- =. +>.$ (pa-sauce ost [[%rust %radio-report %grams q.lab r.lab] ~]) =- =. +>.$ (pa-sauce ost [[%rust %rodeo-report %grams q.lab r.lab] ~])
?: p.lab ?: p.lab
(pa-sauce ost [[%mean ~] ~]) (pa-sauce ost [[%mean ~] ~])
+>.$(guests (~(put by guests) ost riv)) +>.$(guests (~(put by guests) ost riv))
@ -575,7 +575,7 @@
=. +> (pa-watch her) =. +> (pa-watch her)
=. +> (pa-master her) =. +> (pa-master her)
?. (pa-admire her) ?. (pa-admire her)
(pa-sauce ost [[%mean ~ %radio-listen-unauthorized ~] ~]) (pa-sauce ost [[%mean ~ %rodeo-listen-unauthorized ~] ~])
=+ ^= ruv ^- (unit river) =+ ^= ruv ^- (unit river)
?: ?=(~ pax) ?: ?=(~ pax)
`[[%ud count] [%da (dec (bex 128))]] `[[%ud count] [%da (dec (bex 128))]]
@ -590,7 +590,7 @@
`[(point +>.say) (point +>.den)] `[(point +>.say) (point +>.den)]
:: ~& [%pa-listen her pax ruv] :: ~& [%pa-listen her pax ruv]
?~ ruv ?~ ruv
(pa-sauce ost [[%mean ~ %radio-malformed ~] ~]) (pa-sauce ost [[%mean ~ %rodeo-malformed ~] ~])
(pa-start u.ruv) (pa-start u.ruv)
:: ::
++ pa-refresh :: update stream ++ pa-refresh :: update stream
@ -614,7 +614,7 @@
== ==
old old
:- p.old :- p.old
[[p.n.guests %give %rust %radio-report %grams num gam ~] q.old] [[p.n.guests %give %rust %rodeo-report %grams num gam ~] q.old]
=. moves (welp q.moy moves) =. moves (welp q.moy moves)
|- ^+ +>.^$ |- ^+ +>.^$
?~ p.moy +>.^$ ?~ p.moy +>.^$
@ -659,13 +659,13 @@
++ peer ++ peer
|= [ost=bone her=ship pax=path] |= [ost=bone her=ship pax=path]
^- [(list move) _+>] ^- [(list move) _+>]
:: ~& [%radio-peer ost her pax] :: ~& [%rodeo-peer ost her pax]
ra-abet:(~(ra-subscribe ra ost ~) her pax) ra-abet:(~(ra-subscribe ra ost ~) her pax)
:: ::
++ poke-radio-command ++ poke-rodeo-command
|= [ost=bone her=ship cod=command] |= [ost=bone her=ship cod=command]
^- [(list move) _+>] ^- [(list move) _+>]
:: ~& [%radio-poke-command her cod] :: ~& [%rodeo-poke-command her cod]
ra-abet:(~(ra-apply ra ost ~) her cod) ra-abet:(~(ra-apply ra ost ~) her cod)
:: ::
++ pour ++ pour
@ -673,8 +673,8 @@
^- [(list move) _+>] ^- [(list move) _+>]
:: ~& sih=sih :: ~& sih=sih
=+ sih=((hard sign) sih) =+ sih=((hard sign) sih)
:: ~& [%radio-pour ost pax sih] :: ~& [%rodeo-pour ost pax sih]
?+ pax ~& [%radio-strange-path pax] !! ?+ pax ~& [%rodeo-strange-path pax] !!
:: ::
[%provoke ~] [~ +>.$] [%provoke ~] [~ +>.$]
[%time ~] [%time ~]
@ -685,7 +685,7 @@
[%twitter *] [%twitter *]
=- ra-abet:(~(ra-twitter ra ost ~) met sih) =- ra-abet:(~(ra-twitter ra ost ~) met sih)
^= met ^= met
?+ t.pax ~& [%radio-twitter-strange-path pax] !! ?+ t.pax ~& [%rodeo-twitter-strange-path pax] !!
[%mine @ @ ~] [%mine @ @ ~]
[i.t.pax i.t.t.t.pax] [i.t.pax i.t.t.t.pax]
[%stat @ ~] [%stat @ ~]
@ -716,14 +716,14 @@
++ pull ++ pull
|= ost=bone |= ost=bone
^- [(list move) _+>] ^- [(list move) _+>]
:: ~& [%radio-pull ost] :: ~& [%rodeo-pull ost]
ra-abet:~(ra-cancel ra ost ~) ra-abet:~(ra-cancel ra ost ~)
:: ::
++ poke-bit ++ poke-bit
|= [ost=bone you=ship ~] |= [ost=bone you=ship ~]
^- [(list move) _+>] ^- [(list move) _+>]
:_ +>.$ :_ +>.$
=+ paf=/(scot %p our.hid)/try/(scot %da lat.hid)/radio/backlog/jam =+ paf=/(scot %p our.hid)/try/(scot %da lat.hid)/rodeo/backlog/jam
[ost %pass /jamfile %c %info our.hid (foal paf (jam +<+.+>.$))]~ [ost %pass /jamfile %c %info our.hid (foal paf (jam +<+.+>.$))]~
:: ::
++ prep ++ prep
@ -733,12 +733,12 @@
=+ moz=`(list move)`[0 %pass /time %t %wait (add ~s10 lat.hid)]~ =+ moz=`(list move)`[0 %pass /time %t %wait (add ~s10 lat.hid)]~
|- |-
?~ u.old ?~ u.old
=+ paf=/(scot %p our.hid)/try/(scot %da lat.hid)/radio/backlog/jam =+ paf=/(scot %p our.hid)/try/(scot %da lat.hid)/rodeo/backlog/jam
?. ?=([%0 %0 %0] [.^(%cy paf)]) ?. ?=([%0 %0 %0] [.^(%cy paf)])
$(u.old (some ((hard house-any) (cue ((hard ,@) .^(%cx paf)))))) $(u.old (some ((hard house-any) (cue ((hard ,@) .^(%cx paf))))))
~& %radio-prep-new ~& %rodeo-prep-new
ra-abet:~(ra-init ra 0 moz) ra-abet:~(ra-init ra 0 moz)
~& %radio-prep-old ~& %rodeo-prep-old
:- moz :- moz
|- |-
?- -.u.u.old ?- -.u.u.old

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

@ -2,8 +2,8 @@
:::: /hook/core/talk/app :::: /hook/core/talk/app
:: ::
/? 314 /? 314
/- *radio /- *rodeo
/+ radio /+ rodeo
:: ::
:::: ::::
:: ::
@ -89,7 +89,7 @@
$: %rust $: %rust
$= p $= p
$% [%txt p=cord] $% [%txt p=cord]
[%radio-report p=report] [%rodeo-report p=report]
== == == ==
== ==
++ sign ++ sign
@ -109,7 +109,7 @@
|= cod=command |= cod=command
%_ +> %_ +>
moz :_ moz moz :_ moz
[0 %pass /command %g %mess [our /radio] our [%radio-command !>(cod)]] [0 %pass /command %g %mess [our /rodeo] our [%rodeo-command !>(cod)]]
== ==
:: ::
++ hy-render :: return to console ++ hy-render :: return to console
@ -124,11 +124,11 @@
:: ::
++ hy-subscribe :: send %show ++ hy-subscribe :: send %show
|= [way=path hoc=path] |= [way=path hoc=path]
%_(+> moz :_(moz [0 %pass way %g %show [our /radio] our hoc])) %_(+> moz :_(moz [0 %pass way %g %show [our /rodeo] our hoc]))
:: ::
++ hy-unsubscribe :: send %nuke ++ hy-unsubscribe :: send %nuke
|= way=path |= way=path
%_(+> moz :_(moz [0 %pass way %g %nuke [our /radio] our])) %_(+> moz :_(moz [0 %pass way %g %nuke [our /rodeo] our]))
:: ::
++ hy-display :: print to console ++ hy-display :: print to console
|=(tay=(list tank) (hy-render %tang tay)) |=(tay=(list tank) (hy-render %tang tay))
@ -449,7 +449,7 @@
?: ?=(?(%cold %dead) link) ?: ?=(?(%cold %dead) link)
~& [%sy-sign-rust-bad `@tas`link] ~& [%sy-sign-rust-bad `@tas`link]
+>.$ +>.$
?> ?=(%radio-report +<.res) ?> ?=(%rodeo-report +<.res)
?: ?=(%cool link) ?: ?=(%cool link)
:: XX workaround for inverted nice :: XX workaround for inverted nice
$(link %warm) $(link %warm)
@ -624,7 +624,7 @@
%nice [~ +>.$] %nice [~ +>.$]
%mean ~&(%talk-server-crash !!) %mean ~&(%talk-server-crash !!)
?(%rush %rust) ?(%rush %rust)
?> ?=([%radio-report %house *] p.sih) ?> ?=([%rodeo-report %house *] p.sih)
ny-abet:(ny-tell:ny +.p.p.sih) ny-abet:(ny-tell:ny +.p.p.sih)
== ==
:: ::
@ -653,7 +653,7 @@
^- move ^- move
:* 0 %pass /server :* 0 %pass /server
%g %show %g %show
[our.hid /radio] our.hid [our.hid /rodeo] our.hid
/ /
== ==
== ==

19
main/lib/rodeo/core.hook Normal file
View File

@ -0,0 +1,19 @@
::
:::: /hook/core/rodeo/lib
::
:: This file is in the public domain.
::
/? 314
/- *rodeo
::
::::
::
|%
++ main :: main story
|= our=ship ^- cord
=+ can=(clan our)
?+ can %porch
%czar %court
%king %floor
==
--

4
main/mar/radio-command/door.hook → main/mar/rodeo-command/door.hook
View File

@ -1,8 +1,8 @@
:: ::
:::: /hook/door/radio-command/mar :::: /hook/door/rodeo-command/mar
:: ::
/? 314 /? 314
/- *radio /- *rodeo
!: !:
|_ cod=command |_ cod=command
:: ::

4
main/mar/radio-report/door.hook → main/mar/rodeo-report/door.hook
View File

@ -1,8 +1,8 @@
:: ::
:::: /hook/door/radio-report/mar :::: /hook/door/rodeo-report/mar
:: ::
/? 314 /? 314
/- *radio /- *rodeo
!: !:
|_ rep=report |_ rep=report
:: ::

2
main/sur/radio/core.hook → main/sur/rodeo/core.hook
View File

@ -1,5 +1,5 @@
:: ::
:::: /hook/core/radio/sur :::: /hook/core/rodeo/sur
:: ::
|% |%
++ ache |*([a=$+(* *) b=$+(* *)] $%([| p=b] [& p=a])) :: PM 314 ++ ache |*([a=$+(* *) b=$+(* *)] $%([| p=b] [& p=a])) :: PM 314