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

Merge branch 'master' into travis

Browse Source 
test pill creation code
This commit is contained in:
Anton Dyudin 2017-12-01 19:53:14 -08:00
commit d501cc0b4e
4 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/dojo.hoon
View File

@ -1,4 +1,4 @@
:: :: ::
:: :: ::
:::: /hoon/dojo/app :: ::::
:: :: ::
/? 309 :: arvo kelvin

2
app/talk.hoon
View File

@ -1,4 +1,4 @@
:: :: ::
:: :: ::
:::: /hoon/talk/app :: ::
:: :: ::
/? 310

2
gen/ticket.hoon
View File

@ -5,7 +5,7 @@
/? 310
::
::::
::
!.
:- %say
|= $: {now/@da eny/@uvJ bec/beak}
{{her/@p $~} $~}

23
sys/hoon.hoon
View File

@ -247,7 +247,7 @@
:>
:> mold generator: produces a discriminated fork between two types,
:> defaulting to {a}.
|*({a/mold b/mold} $%({$& p/a} {$| p/b}))
|*({a/mold b/mold} $%({$| p/b} {$& p/a}))
::
++ gate
:> function
@ -6498,6 +6498,7 @@
::::
++ bunt
|- ^- hoon
~+
?- sec
{^ *}
%- hail
@ -6587,20 +6588,23 @@
++ whip
|= axe/axis
=+ ^= tun
|= noy/$-(* hoon)
|= $: def/tile
noy/$-(* hoon)
==
^- hoon
?@ nag
=+ luz=[%cnts [[%& 1] ~] [[[%& axe] ~] bunt(sec [%axil %cell])] ~]
=+ luz=[%cnts [[%& 1] ~] [[[%& axe] ~] bunt(sec def)] ~]
?: =(& nag)
[%tsgr [%wtpt [[%& axe] ~] luz [%$ 1]] (noy [& &])]
[%tsgr luz (noy [& &])]
(noy nag)
^- hoon
~+
?- sec
{^ *}
%- hail
=. wat ~
%- tun |= gon/* => .(nag gon) ^- hoon
%+ tun [%axil %cell] |= gon/* => .(nag gon) ^- hoon
:- ^$(sec -.sec, nag -.nag, axe (peg axe 2))
^$(sec +.sec, nag +.nag, axe (peg axe 3))
::
@ -6644,7 +6648,7 @@
{$vine *}
%- hail
=. wat ~
%- tun |= gon/* => .(nag gon) ^- hoon
%+ tun [%axil %cell] |= gon/* => .(nag gon) ^- hoon
?@ -.nag
?: =(& -.nag)
[%wtpt [[%& (peg axe 2)] ~] ^$(sec q.sec) ^$(sec p.sec)]
@ -6679,7 +6683,12 @@
{$kelp *}
%- hail
=. wat ~
%- tun |= gon/* => .(nag gon)
=/ def/tile
:_ [%axil %noun]
=< p
|- ^- line
?~(t.p.sec i.p.sec $(i.p.sec i.t.p.sec, t.p.sec t.t.p.sec))
%+ tun def |= gon/* => .(nag gon)
|- ^- hoon
?~ t.p.sec
:- [%rock +.p.i.p.sec]
@ -11133,7 +11142,7 @@
?~(a !! ?~(t.a [%wing i.a] [%tsgl [%wing i.a] $(a t.a)]))
(most col rope)
::
++ scad !:
++ scad
%+ knee *root |. ~+
%- stew
^. stet ^. limo