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

Merge commit 'f4bd2f' into cabclean

Browse Source
This commit is contained in:
C. Guy Yarvin 2015-12-20 14:50:13 -08:00
commit 19f196afba
1 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
arvo/hoon.hoon
View File

@ -91,6 +91,7 @@
u=[p=(a +>-.b) q=[p=(hair -.b) q=(tape +.b)]] :: u=[p=(a +>-.b) q=[p=(hair -.b) q=(tape +.b)]] ::
++ limb $@ term ++ limb $@ term
$% {$& p/axis} $% {$& p/axis}
{$| p/@ud q/(unit term)}
{$2 p/@ud q/{$~ term}} {$2 p/@ud q/{$~ term}}
== ==
++ line {p/{$leaf p/odor q/@} q/tile} :: %kelp case ++ line {p/{$leaf p/odor q/@} q/tile} :: %kelp case
@ -7495,10 +7496,11 @@
|- ^- type |- ^- type
?~ peh ?~ peh
?:(pol (fuse ref) (crop ref)) ?:(pol (fuse ref) (crop ref))
=> .(i.peh ?^(i.peh i.peh [%2 p=0 q=`i.peh])) => .(i.peh ?^(i.peh i.peh [%| p=0 q=`i.peh]))
=+ ^= poz ^- post =+ ^= poz ^- post
?- -.i.peh ?- -.i.peh
$& [p.i.peh %& (peek %both p.i.peh)] $& [p.i.peh %& (peek %both p.i.peh)]
$| (finq p.i.peh %both +.q.i.peh)
$2 (finq p.i.peh %both +.q.i.peh) $2 (finq p.i.peh %both +.q.i.peh)
== ==
|- ^- type |- ^- type
@ -7506,6 +7508,7 @@
?- -.q.poz ?- -.q.poz
$0 ?- -.i.peh $0 ?- -.i.peh
$& ^$(peh t.peh) $& ^$(peh t.peh)
$| (face +.q.i.peh ^$(peh t.peh, sut p.q.poz))
$2 (face +.q.i.peh ^$(peh t.peh, sut p.q.poz)) $2 (face +.q.i.peh ^$(peh t.peh, sut p.q.poz))
== ==
$1 ^$(peh t.peh) $1 ^$(peh t.peh)
@ -8931,7 +8934,7 @@
^- port ^- port
?~ hyp ?~ hyp
[1 %& sut] [1 %& sut]
=> .(i.hyp ?^(i.hyp i.hyp [%2 p=0 q=`i.hyp])) => .(i.hyp ?^(i.hyp i.hyp [%| p=0 q=`i.hyp]))
=+ zar=$(hyp t.hyp) =+ zar=$(hyp t.hyp)
=+ ^= syp =+ ^= syp
?- -.q.zar ?- -.q.zar
@ -8941,6 +8944,11 @@
?- i.hyp ?- i.hyp
{$& *} {$& *}
[(peg p.zar p.i.hyp) %& (peek(sut syp) way p.i.hyp)] [(peg p.zar p.i.hyp) %& (peek(sut syp) way p.i.hyp)]
::
{$| *}
=> .(sut syp)
=+ hud=(fink p.i.hyp way +.q.i.hyp)
[(peg p.zar p.hud) q.hud]
:: ::
{$2 *} {$2 *}
=> .(sut syp) => .(sut syp)
@ -8974,7 +8982,7 @@
|- ^- {p/axis q/type} |- ^- {p/axis q/type}
?~ peh ?~ peh
[axe mur] [axe mur]
=> .(i.peh ?^(i.peh i.peh [%2 p=0 q=`i.peh])) => .(i.peh ?^(i.peh i.peh [%| p=0 q=`i.peh]))
?- i.peh ?- i.peh
{$& *} {$& *}
=+ ^= sap ^- (unit term) =+ ^= sap ^- (unit term)
@ -8983,6 +8991,19 @@
=+ gav=$(peh t.peh, sut vas, axe (peg axe p.i.peh)) =+ gav=$(peh t.peh, sut vas, axe (peg axe p.i.peh))
=+ heh=(heal ~ p.i.peh q.gav) =+ heh=(heal ~ p.i.peh q.gav)
[p.gav ?~(sap heh (face u.sap heh))] [p.gav ?~(sap heh (face u.sap heh))]
::
{$| *}
=+ dob=`post`(need q:(fino p.i.peh %rite +.q.i.peh))
~| [%tack-limb q.i.peh]
?: ?=($2 -.q.dob)
=+ hoc=(peg axe p.dob)
=+ guh=$(peh t.peh, sut s.p.q.dob, axe (peg hoc r.p.q.dob))
=+ zig=$(peh q.p.q.dob, sut q.q.dob, mur q.guh)
=+ zug=(heal [~ +.q.i.peh] p.dob (busk(sut q.zig) p.p.q.dob q.p.q.dob))
[p.guh zug]
=+ wuf=(flay (flee dob))
=+ gav=$(peh t.peh, sut q.wuf, axe (peg axe p.wuf))
[p.gav (heal [~ +.q.i.peh] p.wuf q.gav)]
:: ::
{$2 *} {$2 *}
=+ dob=`post`(need q:(fino p.i.peh %rite +.q.i.peh)) =+ dob=`post`(need q:(fino p.i.peh %rite +.q.i.peh))
@ -10046,7 +10067,7 @@
dot dot
;~ pose ;~ pose
%+ cook %+ cook
|=({a/(list) b/term} ?~(a b [%2 (lent a) `b])) |=({a/(list) b/term} ?~(a b [%| (lent a) `b]))
;~(plug (star ket) ;~(pose sym (cold %$ buc))) ;~(plug (star ket) ;~(pose sym (cold %$ buc)))
:: ::
%+ cook %+ cook