ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-09-21 15:38:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/urbit/arvo into remaint-merge-talk

Browse Source
This commit is contained in:
Fang 2017-11-09 22:28:24 +01:00
commit 8281e9ac1e
2 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gen/deco.hoon
View File

@ -101,7 +101,7 @@
:> we decorate the mold rather than the arm. the compiler
:> will copy the mold decoration onto the arm.
+|
+= spot {p/@ q/@} :< a coordinate
+= spot [p=@ q=@] :< a coordinate
+= tops :> also a coordinate
{p/@ q/@}
+= goof :> a simple tuple

43
sys/hoon.hoon
View File

@ -6080,8 +6080,15 @@
(hail (home p.sec))
==
++ clam
^- twig
[%brts [~ ~] [%base %noun] (whip(gom 7) 6)]
^- twig
=/ raw [%brts [~ ~] [%base %noun] (whip(gom 7) 6)]
::
:: this performance fix should unify a bunch of trivial functions,
:: but breaks on horrible dogshit hacks in ++raid:zuse.
::
:: ?. ?=(?($axil $leaf) -.sec) raw
:: [%tsgr [%rock %n ] raw]
raw
::
++ whip
|= axe/axis
@ -6703,32 +6710,32 @@
?- q.gen
$~ ~_(leaf+"open-smsg" !!)
^
:+ %tsgr [%ktts %v %$ 1] :: => v=.
:+ %tsgr [%ktts %v %$ 1] :: => v=.
|- ^- twig ::
?: ?=($~ t.q.gen) ::
[%tsgr [%limb %v] i.q.gen] :: =>(v {i.q.gen})
:+ %tsls [%ktts %a $(q.gen t.q.gen)] :: =+ ^= a
:+ %tsls :: {$(q.gen t.q.gen)}
[%ktts %b [%tsgr [%limb %v] i.q.gen]] :: =+ ^= b
:+ %tsls :: =>(v {i.q.gen})
[%tsgr [%limb %v] i.q.gen] :: =>(v {i.q.gen})
:+ %tsls [%ktts %a $(q.gen t.q.gen)] :: =+ ^= a
:+ %tsls :: {$(q.gen t.q.gen)}
[%ktts %b [%tsgr [%limb %v] i.q.gen]] :: =+ ^= b
:+ %tsls :: =>(v {i.q.gen})
:+ %ktts %c :: =+ c=,.+6.b
:+ %tsgl ::
:+ %tsgl ::
[%wing [%| 0 ~] [%& 6] ~] ::
[%limb %b] ::
:+ %brdt [~ ~] :: |.
:^ %cnls :: %+
[%tsgr [%limb %v] p.gen] :: =>(v {p.gen})
[%tsgr [%limb %v] p.gen] :: =>(v {p.gen})
[%cnhp [%limb %b] [%limb %c] ~] :: (b c)
:+ %cnts [%a ~] :: a(,.+6 c)
[[[[%| 0 ~] [%& 6] ~] [%limb %c]] ~] ::
== ::
::
{$smsm *} :: ;;
:+ %tsgr [%ktts %v %$ 1] :: => v=.
:+ %tsls :+ %ktts %a :: =+ ^= a
[%tsgr [%limb %v] p.gen] :: =>(v {p.gen})
:+ %tsls [%ktts %b [%tsgr [%limb %v] q.gen]] :: =+ b==>(v {q.gen})
:+ %tsls :: =+ c=(a b)
{$smsm *} :: ;;
:+ %tsgr [%ktts %v %$ 1] :: => v=.
:+ %tsls :+ %ktts %a :: =+ ^= a
[%tsgr [%limb %v] p.gen] :: =>(v {p.gen})
:+ %tsls [%ktts %b [%tsgr [%limb %v] q.gen]] :: =+ b==>(v {q.gen})
:+ %tsls :: =+ c=(a b)
[%ktts %c [%cnhp [%limb %a] [%limb %b] ~]] ::
:+ %wtgr :: ?>(=(`*`c `*`b) c)
:+ %dtts ::
@ -11748,7 +11755,9 @@
[(welp "events: " (pi-mumm mon.day)) ~]
::
%+ turn
~(tap by hit.day)
%+ sort ~(tap by hit.day)
|= {a/{* @} b/{* @}}
(lth +.a +.b)
|= {nam/term num/@ud}
:(welp (trip nam) ": " (scow %ud num))
["" ~]