urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2025-01-06 21:18:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix bad merge.

Browse Source
This commit is contained in:
C. Guy Yarvin 2015-01-26 09:44:09 -08:00
parent c9caa1538e
commit 335cb42764
3 changed files with 59 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,19 +56,21 @@
statement/stam statement/stam
== ==
:: ::
++ audi (op stati (ci (soft delivery) so)) :: audience ++ audi (op parn memb) :: audience
++ auri (op stati (ci (soft presence) so)) ++ auri (op parn (ci (soft presence) so))
++ memb (ot envelope/lope delivery/(ci (soft delivery) so) ~)
++ lope (ot visible/bo sender/(mu (su parn)) ~)
:: ::
++ stati ++ parn
^- $+(nail (like station)) ^- $+(nail (like partner))
%+ peach %+ peach
;~((glue fas) ;~(pfix sig fed:ag) urs:ab) ;~((glue fas) ;~(pfix sig fed:ag) urs:ab)
%+ sear (soft partner) %+ sear (soft passport)
;~((glue fas) sym urs:ab) :: XX [a-z0-9_]{1,15} ;~((glue fas) sym urs:ab) :: XX [a-z0-9_]{1,15}
:: ::
++ stam ++ stam
^- $+(json (unit statement)) ^- $+(json (unit statement))
=- (ot now/di speech/(of -) ~) =- (ot date/di bouquet/(as (ar so)) speech/(of -) ~)
:~ own/so :~ own/so
say/so say/so
lin/(ot say/bo txt/so ~) lin/(ot say/bo txt/so ~)
@ -80,10 +82,10 @@
++ conf ++ conf
^- $+(json (unit config)) ^- $+(json (unit config))
%- ot :~ %- ot :~
sources/(as (su stati)) sources/(as (su parn))
caption/so
:- %cordon :- %cordon
%+ cu |*(a=^ ?~(-.a a a)) :: XX do type stuff (ot posture/(ci (soft posture) so) list/(as (su fed:ag)) ~)
(ot white/bu list/(as (su fed:ag)) ~)
== ==
-- --
-- -- -- --

37
main/mar/rodeo-report/door.hook
View File

@ -18,12 +18,21 @@
|^ %+ joba -.rep |^ %+ joba -.rep
?- -.rep ?- -.rep
%config ~! rep (conf +.rep) %config ~! rep (conf +.rep)
%house [%a (turn (~(tap by +.rep)) joce)] %house a/(turn (~(tap by +.rep)) jose)
%grams (jobe num/(jone p.rep) tele/[%a (turn q.rep gram)] ~) %grams (jobe num/(jone p.rep) tele/[%a (turn q.rep gram)] ~)
::%group (grop +.rep) %group (jobe local/(grop p.rep) global/%.(q.rep (jome parn grop)) ~)
%group (jobe local/(grop p.rep) global/%.(q.rep (jome stan grop)) ~)
== ==
++ joce |=(a=span [%s a]) ++ joce |=(a=span [%s a])
++ jose
|= [a=span b=posture c=cord]
(jobe name/[%s a] posture/[%s a] caption/[%s b] ~)
::
++ jove
|= [a=envelope b=delivery]
%- jobe :~
envelope/(jobe visible/[%b p.a] sender/?~(q.a ~ s/(parn u.q.a)) ~)
delivery/[%s b]
==
++ jope |=(a=ship (jape +:<a>)) ::[%s (crip +:(scow %p a))]) ++ jope |=(a=ship (jape +:<a>)) ::[%s (crip +:(scow %p a))])
++ joke |=(a=tank [%s (role (turn (wash 0^80 a) crip))]) ++ joke |=(a=tank [%s (role (turn (wash 0^80 a) crip))])
++ jode |=(a=time (jone (div (mul (sub a ~1970.1.1) 1.000) ~s1))) ++ jode |=(a=time (jone (div (mul (sub a ~1970.1.1) 1.000) ~s1)))
@ -51,16 +60,23 @@
|= thought |= thought
(jobe serial/(jape <p>) audience/(audi q) statement/(stam r) ~) (jobe serial/(jape <p>) audience/(audi q) statement/(stam r) ~)
:: ::
++ audi (jome stan joce) ++ audi (jome parn jove)
++ stan ++ bouq
|= a=station ^- cord |= a=bouquet
a/(turn (~(tap in a)) |=(b=path a/(turn b |=(c=span s/c))))
::
++ parn
|= a=partner ^- cord
%- crip %- crip
?~ -.a "{<p.p.a>}/{(trip q.p.a)}" ?~ -.a "{<p.p.a>}/{(trip q.p.a)}"
?- -.p.a ?- -.p.a
%twitter "{(trip -.p.a)}/{(trip p.p.a)}" %twitter "{(trip -.p.a)}/{(trip p.p.a)}"
== ==
:: ::
++ stam |=(statement (jobe time/(jode p) speech/(spec q) ~)) ++ stam
|= statement
(jobe date/(jode p) bouquet/(bouq q) speech/(spec r) ~)
::
++ spec ++ spec
|= a=speech |= a=speech
%+ joba -.a %+ joba -.a
@ -84,9 +100,10 @@
++ conf ++ conf
|= config |= config
%- jobe :~ %- jobe :~
sources/[%a (turn (~(tap in sources)) |=(a=station [%s (stan a)]))] sources/[%a (turn (~(tap in sources)) |=(a=partner [%s (parn a)]))]
=- cordon/(jobe white/[%b -.cordon] list/[%a -] ~) caption/[%s caption]
(turn (~(tap in p.cordon)) jope) :: XX jase =- cordon/(jobe posture/[%s -.cordon] list/[%a -] ~)
(turn (~(tap in q.cordon)) jope) :: XX jase
== ==
-- --
-- -- -- --

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

@ -1,21 +1,22 @@
:: ::
:::: /hook/core/rodeo/sur :::: /hook/core/rodeo/sur
:: !:
|% |%
++ ache |*([a=$+(* *) b=$+(* *)] $%([| p=b] [& p=a])) :: PM 314 ++ ache |*([a=$+(* *) b=$+(* *)] $%([| p=b] [& p=a])) :: PM 314
++ audience (map station delivery) :: destination/state ++ audience (map partner (pair envelope delivery)) :: destination/state
++ atlas (map ship status) :: presence map ++ atlas (map ship status) :: presence map
++ bouquet (set flavor) :: complete aroma
++ command :: effect on party ++ command :: effect on party
$% [%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
== :: == ::
++ config :: party configuration ++ config :: party configuration
$: sources=(set station) :: pulls from $: sources=(set partner) :: pulls from
cordon=control :: & white, | black caption=cord :: about
cordon=control :: restricted to
== :: == ::
++ cousin (pair ship span) :: domestic flow ++ control (pair posture (set ship)) :: access control
++ control (ache (set ship) (set ship)) :: & white, | black
++ delivery :: delivery state ++ delivery :: delivery state
$? %pending :: undelivered $? %pending :: undelivered
%received :: delivered %received :: delivered
@ -23,21 +24,29 @@
%released :: sent one-way %released :: sent one-way
%accepted :: fully processed %accepted :: fully processed
== :: == ::
++ envelope (pair ,? (unit partner)) :: visible, sender
++ flavor path :: content flavor
++ human :: human identifier ++ human :: human identifier
$: true=(unit (trel ,@t (unit ,@t) ,@t)) :: true name $: true=(unit (trel ,@t (unit ,@t) ,@t)) :: true name
hand=(unit ,@t) :: handle hand=(unit ,@t) :: handle
== :: == ::
++ partner :: foreign flow ++ passport :: foreign flow
$% [%twitter p=@t] :: twitter $% [%twitter p=@t] :: twitter
== :: == ::
++ posture :: security posture
$? %black :: public
%white :: private
%green :: readonly
%brown :: writeonly
== ::
++ presence ?(%gone %hear %talk) :: status type ++ presence ?(%gone %hear %talk) :: status type
++ register (pair atlas (map station atlas)) :: ping me, ping srcs ++ register (pair atlas (map partner atlas)) :: ping me, ping srcs
++ report :: radio update ++ report :: radio update
$% [%config config] :: reconfigure $% [%config config] :: reconfigure
:: [%folder (list report)] :: multiple :: [%folder (list report)] :: multiple
[%grams (pair ,@ud (list telegram))] :: beginning, thoughts [%grams (pair ,@ud (list telegram))] :: beginning, thoughts
[%group register] :: presence [%group register] :: presence
[%house (set span)] :: station set [%house (map span (pair posture cord))] :: station set
== :: == ::
++ speech :: narrative action ++ speech :: narrative action
:: XX unify %own and %say to %lin :: XX unify %own and %say to %lin
@ -55,9 +64,10 @@
[%say p=@t] :: XX normal line [%say p=@t] :: XX normal line
== :: == ::
++ serial ,@uvH :: unique identity ++ serial ,@uvH :: unique identity
++ station (each cousin partner) :: interlocutor ++ partner (each station passport) :: interlocutor
++ status (pair presence human) :: participant ++ status (pair presence human) :: participant
++ statement (pair ,@da speech) :: when this ++ statement (trel ,@da bouquet speech) :: when this
++ station (pair ship span) :: domestic flow
++ telegram (pair ship thought) :: who which whom what ++ telegram (pair ship thought) :: who which whom what
++ thought (trel serial audience statement) :: which whom what ++ thought (trel serial audience statement) :: which whom what
++ torso :: attachment ++ torso :: attachment