urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-12-04 04:35:02 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branches 'fwd-wyt', 'fwd-ford-platform-dependencies', 'fwd-talk-who-fix' and 'fwd-talk-showtime'

Browse Source 
Merge various forward-ported branches

Hint +-wyt:in
Add /===/mar and /===/arvo to %core req dependents
Fix talk's parsing of ;who
Talk setting: message timestamps
This commit is contained in:
Raymond Pasco 2016-12-12 14:47:03 -08:00
commit 3953977cdb
3 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/talk.hoon
View File

@ -293,6 +293,7 @@
%- perk :~ %- perk :~
%noob %noob
%quiet %quiet
%showtime
== ==
++ work ++ work
%+ knee *^work |. ~+ %+ knee *^work |. ~+
@ -304,7 +305,7 @@
qut qut
== ==
:: ::
;~(plug (perk %who ~) ;~(pose para (easy ~))) ;~(plug (perk %who ~) ;~(pose ;~(pfix ace para) (easy ~)))
;~(plug (perk %bind ~) ;~(pfix ace glyph) (punt ;~(pfix ace para))) ;~(plug (perk %bind ~) ;~(pfix ace glyph) (punt ;~(pfix ace para)))
;~((glue ace) (perk %join ~) para) ;~((glue ace) (perk %join ~) para)
;~((glue ace) (perk %leave ~) para) ;~((glue ace) (perk %leave ~) para)
@ -440,8 +441,8 @@
:: ::
++ sh-rend :: print on one line ++ sh-rend :: print on one line
|= gam/telegram |= gam/telegram
=+ lin=~(tr-line tr man.she (~(has in settings.she) %noob) gam) =+ lin=~(tr-line tr man.she settings.she gam)
(sh-pass:(sh-fact %txt lin) q.q.gam) (sh-pass:(sh-fact %txt lin) q.q.gam)
:: ::
++ sh-numb :: print msg number ++ sh-numb :: print msg number
|= num/@ud |= num/@ud
@ -1007,7 +1008,7 @@
++ activate :: from %number ++ activate :: from %number
|= gam/telegram |= gam/telegram
^+ ..sh-work ^+ ..sh-work
=+ tay=~(. tr man.she (~(has in settings.she) %noob) gam) =+ tay=~(. tr man.she settings.she gam)
=. ..sh-work (sh-fact tr-fact:tay) =. ..sh-work (sh-fact tr-fact:tay)
sh-prod(active.she `tr-pals:tay) sh-prod(active.she `tr-pals:tay)
:: ::
@ -2094,7 +2095,7 @@
:: ::
++ tr :: telegram renderer ++ tr :: telegram renderer
|_ $: man/knot |_ $: man/knot
nob/? sef/(set knot)
who/ship who/ship
sen/serial sen/serial
aud/audience aud/audience
@ -2111,9 +2112,18 @@
=+ ^= baw =+ ^= baw
:: ?: oug :: ?: oug
:: ~(te-whom te man tr-pals) :: ~(te-whom te man tr-pals)
?. nob ?. (~(has in sef) %noob)
(~(sn-curt sn man [who (main who)]) |) (~(sn-curt sn man [who (main who)]) |)
(~(sn-nick sn man [who (main who)])) (~(sn-nick sn man [who (main who)]))
?: (~(has in sef) %showtime)
=+ dat=(yore now.hid)
=+ ^= t
|= a/@ ^- tape
%+ weld
?: (lth a 10) "0" ~
(scow %ud a)
=+ ^= time :(weld "~" (t h.t.dat) "." (t m.t.dat) "." (t s.t.dat))
:(weld baw txt (reap (sub 67 (lent txt)) ' ') time)
(weld baw txt) (weld baw txt)
:: ::
++ tr-meta ^- tang ++ tr-meta ^- tang

4
sys/hoon.hoon
View File

@ -1096,7 +1096,9 @@
$(b [n.b l.b $(b r.b, a [n.a ~ r.a])], a l.a) $(b [n.b l.b $(b r.b, a [n.a ~ r.a])], a l.a)
:: ::
+- wyt :: size of set +- wyt :: size of set
|- ^- @ =< $
~% %wyt + ~
|. ^- @
?~(a 0 +((add $(a l.a) $(a r.a)))) ?~(a 0 +((add $(a l.a) $(a r.a))))
-- --
:: :: :: ::

6
sys/vane/ford.hoon
View File

@ -1323,6 +1323,12 @@
:: ::
$core $core
%+ cool |.(leaf+"ford: core {<(en-beam p.kas)>}") %+ cool |.(leaf+"ford: core {<(en-beam p.kas)>}")
:: code runtime behaviour is frequently affected by marks
:: TODO: track this more formally
%+ flag [bek /mar]
:: until /? is in use, any hoon may implicitly depend on arvo types
%+ flag [bek /arvo/hoon]
%+ flag [bek /arvo/zuse]
(cope (lear cof p.kas) (flux |=(a/vase [%& %core a]))) (cope (lear cof p.kas) (flux |=(a/vase [%& %core a])))
:: ::
$diff $diff