urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2025-01-07 13:37:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Renaming of talk structure faces now also applied to its report mark.

Browse Source
This commit is contained in:
Fang 2017-04-25 15:40:25 +02:00
parent 7c385e7203
commit 6e7d9c58a8
1 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
mar/talk/report.hoon
View File

@ -19,16 +19,19 @@
=> + => +
|^ %+ joba -.rep |^ %+ joba -.rep
?- -.rep ?- -.rep
$cabal (cabl +.rep) $cabal (cabl cab.rep)
$grams (jobe num+(jone p.rep) tele+[%a (turn q.rep gram)] ~) $grams (jobe num+(jone num.rep) tele+[%a (turn gaz.rep gram)] ~)
$group (jobe local+(grop p.rep) global+%.(q.rep (jome parn grop)) ~) $group %^ jobe
local+(grop loc.reg.rep)
global+%.(rem.reg.rep (jome parn grop))
~
== ==
++ joce |=(a/knot [%s a]) ++ joce |=(a/knot [%s a])
:: ::
++ jove ++ jove
|= {a/envelope b/delivery} |= {a/envelope b/delivery}
%- jobe :~ %- jobe :~
envelope+(jobe visible+[%b p.a] sender+?~(q.a ~ s+(parn u.q.a)) ~) envelope+(jobe visible+[%b vis.a] sender+?~(sen.a ~ s+(parn u.sen.a)) ~)
delivery+[%s b] delivery+[%s b]
== ==
++ jope |=(a/ship (jape +:<a>)) ::[%s (crip +:(scow %p a))]) ++ jope |=(a/ship (jape +:<a>)) ::[%s (crip +:(scow %p a))])
@ -47,11 +50,11 @@
++ nack |=(a/(set (set partner)) [%a (turn (~(tap in a)) sorc)]) ++ nack |=(a/(set (set partner)) [%a (turn (~(tap in a)) sorc)])
++ grop (jome phon stas) :: (map ship status) ++ grop (jome phon stas) :: (map ship status)
++ phon |=(a/ship (scot %p a)) ++ phon |=(a/ship (scot %p a))
++ stas |=(status (jobe presence+(joce p) human+(huma q) ~)) ++ stas |=(status (jobe presence+(joce pec) human+(huma man) ~))
++ gram |=(telegram (jobe ship+(jope p) thought+(thot q) ~)) ++ gram |=(telegram (jobe ship+(jope aut) thought+(thot tot) ~))
++ thot ++ thot
|= thought |= thought
(jobe serial+(jape <p>) audience+(audi q) statement+(stam r) ~) (jobe serial+(jape <uid>) audience+(audi aud) statement+(stam sam) ~)
:: ::
++ audi (jome parn jove) ++ audi (jome parn jove)
++ bouq ++ bouq
@ -69,23 +72,23 @@
== ==
:: ::
++ stat ++ stat
|= a/station ^- cord |= a/circle ^- cord
(crip "{<p.a>}/{(trip q.a)}") (crip "{<hos.a>}/{(trip nom.a)}")
:: ::
++ stam ++ stam
|= statement |= statement
(jobe date+(jode p) bouquet+(bouq q) speech+(spec r) ~) (jobe date+(jode wen) bouquet+(bouq boq) speech+(spec sep) ~)
:: ::
++ spec ++ spec
|= a/speech |= a/speech
%+ joba -.a %+ joba -.a
?+ -.a ~|(stub+-.a !!) ?+ -.a ~|(stub+-.a !!)
$lin (jobe txt+[%s q.a] say+[%b p.a] ~) $lin (jobe txt+[%s msg.a] say+[%b pat.a] ~)
$url (joba txt+[%s (crip (earf p.a))]) $url (joba txt+[%s (crip (earf url.a))])
$exp (joba txt+[%s p.a]) $exp (joba txt+[%s exp.a])
$app (jobe txt+[%s q.a] src+[%s p.a] ~) $fat (jobe tor+(tors tac.a) taf+$(a sep.a) ~)
$fat (jobe tor+(tors p.a) taf+$(a q.a) ~) $mor a+(turn ses.a spec)
$mor a+(turn p.a spec) $app (jobe txt+[%s msg.a] src+[%s app.a] ~)
$api $api
%- jobe :~ %- jobe :~
service+s+service.a service+s+service.a
@ -105,16 +108,16 @@
?- -.a ?- -.a
$text [%s (role +.a)] $text [%s (role +.a)]
$tank [%a (turn +.a joke)] $tank [%a (turn +.a joke)]
$name (jobe nom+s+p.a mon+$(a q.a) ~) $name (jobe nom+s+nom.a mon+$(a tac.a) ~)
== ==
:: ::
++ huma ++ huma
|= human |= human
%^ jobe %^ jobe
hand+?~(hand ~ [%s u.hand]) hand+?~(han ~ [%s u.han])
:- %true :- %true
?~ true ~ ?~ tru ~
=+ u.true =+ u.tru
(jobe first+[%s p] middle+?~(q ~ [%s u.q]) last+[%s r] ~) (jobe first+[%s p] middle+?~(q ~ [%s u.q]) last+[%s r] ~)
~ ~
:: ::
@ -122,7 +125,7 @@
|= cabal |= cabal
%- jobe :~ %- jobe :~
loc+(conf loc) loc+(conf loc)
ham+((jome stat conf) ham) ham+((jome stat conf) rem)
== ==
:: ::
++ sorc ++ sorc
@ -132,10 +135,10 @@
++ conf ++ conf
|= config |= config
%- jobe :~ %- jobe :~
sources+(sorc sources) sources+(sorc src)
caption+[%s caption] caption+[%s cap]
=- cordon+(jobe posture+[%s -.cordon] list+[%a -] ~) =- cordon+(jobe posture+[%s -.con] list+[%a -] ~)
(turn (~(tap in q.cordon)) jope) :: XX jase (turn (~(tap in ses.con)) jope) :: XX jase
== ==
-- --
-- -- -- --