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

Merge branch 'cabmold' into cabdone

Browse Source
This commit is contained in:
C. Guy Yarvin 2015-12-01 10:56:58 -08:00
commit ca768f8c61
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
arvo/hoon.hoon
View File

@ -206,6 +206,7 @@
{$bczp p+base} :: bunt an axil {$bczp p+base} :: bunt an axil
:: :::::: cores :: :::::: cores
{$brcb p+tile q+(map term foot)} :: %gold tray, sample p {$brcb p+tile q+(map term foot)} :: %gold tray, sample p
{$brcl p+twig q+twig} :: %brts by example
{$brcn p+(map term foot)} :: %gold core, natural {$brcn p+(map term foot)} :: %gold core, natural
{$brdt p+twig} :: dry %gold trap {$brdt p+twig} :: dry %gold trap
{$brfs p+tile q+(map term foot)} :: vulcan. %gold tray {$brfs p+tile q+(map term foot)} :: vulcan. %gold tray
@ -483,9 +484,9 @@
|= a+@ |= a+@
^- ?(%2 %3) ^- ?(%2 %3)
?- a ?- a
%2 %2 $2 %2
%3 %3 $3 %3
?(%0 %1) !! ?($0 $1) !!
* $(a (div a 2)) * $(a (div a 2))
== ==
:: ::
@ -501,7 +502,7 @@
:: ::
++ div :: divide ++ div :: divide
~/ %div ~/ %div
|= {a+_~(`@`1) b+_~(`@`1)} |: [a=`@`1 b=`@`1]
^- @ ^- @
~| 'div' ~| 'div'
?< =(0 b) ?< =(0 b)
@ -550,10 +551,10 @@
|= a+@ |= a+@
^- @ ^- @
?- a ?- a
1 !! $1 !!
2 1 $2 1
3 1 $3 1
* (add (mod a 2) (mul $(a (div a 2)) 2)) * (add (mod a 2) (mul $(a (div a 2)) 2))
== ==
:: ::
++ max :: maximum ++ max :: maximum
@ -572,14 +573,14 @@
:: ::
++ mod :: remainder ++ mod :: remainder
~/ %mod ~/ %mod
|= {a+_~(`@`1) b+_~(`@`1)} |: [a=`@`1 b=`@`1]
^- @ ^- @
?< =(0 b) ?< =(0 b)
(sub a (mul b (div a b))) (sub a (mul b (div a b)))
:: ::
++ mul :: multiply ++ mul :: multiply
~/ %mul ~/ %mul
|= [a=_`@`1 b=_`@`1] |: [a=`@`1 b=`@`1]
^- @ ^- @
=+ c=0 =+ c=0
|- |-
@ -588,7 +589,7 @@
:: ::
++ peg :: tree connect ++ peg :: tree connect
~/ %peg ~/ %peg
|= [a=@ b=@] |= {a+@ b+@}
^- @ ^- @
?- b ?- b
1 a 1 a
@ -7017,6 +7018,7 @@
[%bctr *] [%ktsg ~(bunt al p.gen)] [%bctr *] [%ktsg ~(bunt al p.gen)]
[%bczp *] [%bctr %axil p.gen] [%bczp *] [%bctr %axil p.gen]
[%brcb *] [%tsls [%bctr p.gen] [%brcn q.gen]] [%brcb *] [%tsls [%bctr p.gen] [%brcn q.gen]]
[%brcl *] [%tsls [%ktsg p.gen] [%brdt q.gen]]
[%brdt *] [%brcn (~(put by *(map term foot)) %$ [%ash p.gen])] [%brdt *] [%brcn (~(put by *(map term foot)) %$ [%ash p.gen])]
[%brtr *] [%brfs p.gen (~(put by *(map term foot)) %$ [%elm q.gen])] [%brtr *] [%brfs p.gen (~(put by *(map term foot)) %$ [%elm q.gen])]
[%brfs *] ~| %elm-tile [%brfs *] ~| %elm-tile