From 335cb42764d563bfe77553cb66e1b90dc0c5c8de Mon Sep 17 00:00:00 2001 From: "C. Guy Yarvin" Date: Mon, 26 Jan 2015 09:44:09 -0800 Subject: [PATCH] Fix bad merge. --- main/mar/rodeo-command/door.hook | 20 +++++++++-------- main/mar/rodeo-report/door.hook | 37 +++++++++++++++++++++++--------- main/sur/rodeo/core.hook | 32 +++++++++++++++++---------- 3 files changed, 59 insertions(+), 30 deletions(-) diff --git a/main/mar/rodeo-command/door.hook b/main/mar/rodeo-command/door.hook index ebb3c9d6db..df31d547ee 100644 --- a/main/mar/rodeo-command/door.hook +++ b/main/mar/rodeo-command/door.hook @@ -56,19 +56,21 @@ statement/stam == :: - ++ audi (op stati (ci (soft delivery) so)) :: audience - ++ auri (op stati (ci (soft presence) so)) + ++ audi (op parn memb) :: audience + ++ 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 - ^- $+(nail (like station)) + ++ parn + ^- $+(nail (like partner)) %+ peach ;~((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} :: ++ stam ^- $+(json (unit statement)) - =- (ot now/di speech/(of -) ~) + =- (ot date/di bouquet/(as (ar so)) speech/(of -) ~) :~ own/so say/so lin/(ot say/bo txt/so ~) @@ -80,10 +82,10 @@ ++ conf ^- $+(json (unit config)) %- ot :~ - sources/(as (su stati)) + sources/(as (su parn)) + caption/so :- %cordon - %+ cu |*(a=^ ?~(-.a a a)) :: XX do type stuff - (ot white/bu list/(as (su fed:ag)) ~) + (ot posture/(ci (soft posture) so) list/(as (su fed:ag)) ~) == -- -- -- diff --git a/main/mar/rodeo-report/door.hook b/main/mar/rodeo-report/door.hook index d1e5b3b0cb..7f9551f932 100644 --- a/main/mar/rodeo-report/door.hook +++ b/main/mar/rodeo-report/door.hook @@ -18,12 +18,21 @@ |^ %+ joba -.rep ?- -.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)] ~) - ::%group (grop +.rep) - %group (jobe local/(grop p.rep) global/%.(q.rep (jome stan grop)) ~) + %group (jobe local/(grop p.rep) global/%.(q.rep (jome parn grop)) ~) == ++ 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 +:)) ::[%s (crip +:(scow %p a))]) ++ 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))) @@ -51,16 +60,23 @@ |= thought (jobe serial/(jape

) audience/(audi q) statement/(stam r) ~) :: - ++ audi (jome stan joce) - ++ stan - |= a=station ^- cord + ++ audi (jome parn jove) + ++ bouq + |= a=bouquet + a/(turn (~(tap in a)) |=(b=path a/(turn b |=(c=span s/c)))) + :: + ++ parn + |= a=partner ^- cord %- crip ?~ -.a "{}/{(trip q.p.a)}" ?- -.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 |= a=speech %+ joba -.a @@ -84,9 +100,10 @@ ++ conf |= config %- jobe :~ - sources/[%a (turn (~(tap in sources)) |=(a=station [%s (stan a)]))] - =- cordon/(jobe white/[%b -.cordon] list/[%a -] ~) - (turn (~(tap in p.cordon)) jope) :: XX jase + sources/[%a (turn (~(tap in sources)) |=(a=partner [%s (parn a)]))] + caption/[%s caption] + =- cordon/(jobe posture/[%s -.cordon] list/[%a -] ~) + (turn (~(tap in q.cordon)) jope) :: XX jase == -- -- -- diff --git a/main/sur/rodeo/core.hook b/main/sur/rodeo/core.hook index b5e2c7bfbc..5654fe5303 100644 --- a/main/sur/rodeo/core.hook +++ b/main/sur/rodeo/core.hook @@ -1,21 +1,22 @@ :: :::: /hook/core/rodeo/sur - :: + !: |% ++ 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 +++ bouquet (set flavor) :: complete aroma ++ command :: effect on party $% [%design (pair span (unit config))] :: configure/destroy [%publish (list thought)] :: originate [%review (list thought)] :: deliver == :: ++ config :: party configuration - $: sources=(set station) :: pulls from - cordon=control :: & white, | black + $: sources=(set partner) :: pulls from + caption=cord :: about + cordon=control :: restricted to == :: -++ cousin (pair ship span) :: domestic flow -++ control (ache (set ship) (set ship)) :: & white, | black +++ control (pair posture (set ship)) :: access control ++ delivery :: delivery state $? %pending :: undelivered %received :: delivered @@ -23,21 +24,29 @@ %released :: sent one-way %accepted :: fully processed == :: +++ envelope (pair ,? (unit partner)) :: visible, sender +++ flavor path :: content flavor ++ human :: human identifier $: true=(unit (trel ,@t (unit ,@t) ,@t)) :: true name hand=(unit ,@t) :: handle == :: -++ partner :: foreign flow +++ passport :: foreign flow $% [%twitter p=@t] :: twitter == :: +++ posture :: security posture + $? %black :: public + %white :: private + %green :: readonly + %brown :: writeonly + == :: ++ 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 $% [%config config] :: reconfigure :: [%folder (list report)] :: multiple [%grams (pair ,@ud (list telegram))] :: beginning, thoughts [%group register] :: presence - [%house (set span)] :: station set + [%house (map span (pair posture cord))] :: station set == :: ++ speech :: narrative action :: XX unify %own and %say to %lin @@ -55,9 +64,10 @@ [%say p=@t] :: XX normal line == :: ++ serial ,@uvH :: unique identity -++ station (each cousin partner) :: interlocutor +++ partner (each station passport) :: interlocutor ++ 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 ++ thought (trel serial audience statement) :: which whom what ++ torso :: attachment