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

Merge commit 'fda10e' into HEAD

Browse Source
This commit is contained in:
C. Guy Yarvin 2015-12-20 15:40:04 -08:00
commit 4ffd2d44ad
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
arvo/hoon.hoon
View File

@ -89,10 +89,10 @@
?@ +.b ~ :: ?@ +.b ~ ::
:- ~ :: :- ~ ::
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 :: wing element
$% {$& p/axis} $% {$& p/axis} :: by geometry
{$| p/@ud q/(unit term)} {$| p/@ud q/(unit term)} :: by name
== == ::
++ line {p/{$leaf p/odor q/@} q/tile} :: %kelp case ++ line {p/{$leaf p/odor q/@} q/tile} :: %kelp case
++ list |* a/$+(* *) :: null-term list ++ list |* a/$+(* *) :: null-term list
$@($~ {i/a t/(list a)}) :: $@($~ {i/a t/(list a)}) ::
@ -6608,7 +6608,7 @@
:: ::
++ slab ++ slab
|= {cog/@tas typ/type} |= {cog/@tas typ/type}
!=(~ q:(~(fino ut typ) 0 %free cog)) !=(~ q:(~(fino ut typ) 0 %free `cog))
:: ::
++ slob :: superficial arm ++ slob :: superficial arm
|= {cog/@tas typ/type} |= {cog/@tas typ/type}
@ -7349,7 +7349,6 @@
%duck duck %duck duck
%dune dune %dune dune
%dunk dunk %dunk dunk
%fink fink
%fire fire %fire fire
%firm firm %firm firm
%fish fish %fish fish
@ -7964,12 +7963,12 @@
[[%leaf (mesc (trip paz))] duck ~] [[%leaf (mesc (trip paz))] duck ~]
:: ::
++ fino ++ fino
|= {dep/@ud way/?($read $rite $both $free) cog/term} |= {dep/@ud way/?($read $rite $both $free) cug/(unit term)}
=+ gil=*(set type) =+ gil=*(set type)
|- ^- {p/@ud q/(unit post)} |- ^- {p/@ud q/(unit post)}
?+ sut [dep ~] ?+ sut [dep ~]
{$bull *} {$bull *}
?. =(cog p.p.sut) ?. &(?=(^ cug) =(u.cug p.p.sut))
$(sut q.sut) $(sut q.sut)
?. ?=($0 dep) ?. ?=($0 dep)
$(dep (dec dep), sut q.sut) $(dep (dec dep), sut q.sut)
@ -7985,7 +7984,7 @@
[p.taf ~ (peg 2 p.u.q.taf) q.u.q.taf] [p.taf ~ (peg 2 p.u.q.taf) q.u.q.taf]
:: ::
{$core *} {$core *}
=+ zem=(look cog q.r.q.sut) =+ zem=?~(cug ~ (look u.cug q.r.q.sut))
=> ^+(. ?:(|(=(~ zem) =(0 dep)) . .(dep (dec dep), zem ~))) => ^+(. ?:(|(=(~ zem) =(0 dep)) . .(dep (dec dep), zem ~)))
?^ zem ?^ zem
[dep ~ 1 [%1 (peg 2 p.u.zem) [[sut(p.q %gold) q.u.zem] ~]]] [dep ~ 1 [%1 (peg 2 p.u.zem) [[sut(p.q %gold) q.u.zem] ~]]]
@ -8000,8 +7999,8 @@
$(sut repo) $(sut repo)
:: ::
{$face *} {$face *}
?: =(cog p.sut) ?: |(?=($~ cug) =(u.cug p.sut))
?. ?=($0 dep) ?. =(0 dep)
[(dec dep) ~] [(dec dep) ~]
[0 ~ 1 %0 q.sut] [0 ~ 1 %0 q.sut]
[dep ~] [dep ~]
@ -8046,13 +8045,13 @@
$(gil (~(put in gil) sut), sut repo) $(gil (~(put in gil) sut), sut repo)
== ==
:: ::
++ fink ++ finc
~/ %fink ~/ %finc
|= {dep/@ud way/?($read $rite $both $free) cog/term} |= {dep/@ud way/?($read $rite $both $free) cug/(unit term)}
^- port ^- port
:: ~_ (dunk 'type') :: ~_ (dunk 'type')
~_ (show [%c 'find-limb'] ?:(=(%$ cog) '$' [%a cog])) ~_ (show [%c 'find-limb'] ?~(cug '*' ?:(=(%$ u.cug) '$' [%a u.cug])))
=+ hoq=(fino dep way cog) =+ hoq=(fino dep way cug)
?~ q.hoq ?~ q.hoq
~|(%find-none !!) ~|(%find-none !!)
(flee u.q.hoq) (flee u.q.hoq)
@ -8062,7 +8061,7 @@
^- post ^- post
:: ~_ (dunk 'type') :: ~_ (dunk 'type')
~_ (show [%c 'find-limb'] ?:(=(%$ cog) '$' [%a cog])) ~_ (show [%c 'find-limb'] ?:(=(%$ cog) '$' [%a cog]))
=+ hoq=(fino dep way cog) =+ hoq=(fino dep way `cog)
?~ q.hoq ?~ q.hoq
~|(%find-none !!) ~|(%find-none !!)
u.q.hoq u.q.hoq
@ -8944,7 +8943,7 @@
:: ::
{$| *} {$| *}
=> .(sut syp) => .(sut syp)
=+ hud=(fink p.i.hyp way +.q.i.hyp) =+ hud=(finc p.i.hyp way q.i.hyp)
[(peg p.zar p.hud) q.hud] [(peg p.zar p.hud) q.hud]
== ==
:: ::
@ -8985,7 +8984,7 @@
[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)) =+ dob=`post`(need q:(fino p.i.peh %rite q.i.peh))
~| [%tack-limb q.i.peh] ~| [%tack-limb q.i.peh]
?: ?=($2 -.q.dob) ?: ?=($2 -.q.dob)
=+ hoc=(peg axe p.dob) =+ hoc=(peg axe p.dob)