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

Eliminate snubbing.

Browse Source
This commit is contained in:
C. Guy Yarvin 2015-12-26 06:44:32 -05:00
parent e8d575db20
commit d9b7eba2c2
1 changed files with 45 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
arvo/hoon.hoon
View File

@ -6618,7 +6618,7 @@
:: ::
++ slab :: test if contains ++ slab :: test if contains
|= {cog/@tas typ/span} |= {cog/@tas typ/span}
=(& -:(~(feel ut typ) %free [cog ~])) =(& -:(~(find ut typ) %free [cog ~]))
:: ::
++ slob :: superficial arm ++ slob :: superficial arm
|= {cog/@tas typ/span} |= {cog/@tas typ/span}
@ -7365,13 +7365,12 @@
%mull mull %mull mull
%nest nest %nest nest
%play play %play play
%park park
%peek peek %peek peek
%repo repo %repo repo
%rest rest %rest rest
%seek seek %seek seek
%tack tack %tack tack
%tock tock %toss toss
%wrap wrap %wrap wrap
== ==
=+ :* fan=*(set {span twig}) =+ :* fan=*(set {span twig})
@ -7549,7 +7548,7 @@
:: ::
{$pick *} {$pick *}
=^ coz gid (many p.q.ham) =^ coz gid (many p.q.ham)
:_(gid [%rose [[' ' ~] ['{' ~] ['}' ~]] coz]) :_(gid [%rose [[' ' ~] ['?(' ~] [')' ~]] coz])
:: ::
{$plot *} {$plot *}
=^ coz gid (many p.q.ham) =^ coz gid (many p.q.ham)
@ -7920,7 +7919,7 @@
[['.' ~] ['-' ~] ~ ~] [['.' ~] ['-' ~] ~ ~]
[[%leaf (mesc (trip paz))] duck ~] [[%leaf (mesc (trip paz))] duck ~]
:: ::
++ feel ++ find
|= {way/?($read $rite $both $free) hyp/wing} |= {way/?($read $rite $both $free) hyp/wing}
=| nol/vein =| nol/vein
|- ^- pont |- ^- pont
@ -7989,16 +7988,9 @@
?^ zem ?^ zem
:+ %& [`axe lon] :+ %& [`axe lon]
[%| (peg 2 p.u.zem) [[ref(p.q %gold) q.u.zem] ~ ~]] [%| (peg 2 p.u.zem) [[ref(p.q %gold) q.u.zem] ~ ~]]
=+ ^- {sam/? con/?} =+ pec=(perk way p.q.ref)
?: ?=($gold p.q.ref) [& &] ?. sam.pec lose
?- way ?: con.pec $(ref p.ref, axe (peg axe 3))
$both [| |]
$free [& &]
$read [?=($zinc p.q.ref) |]
$rite [?=($iron p.q.ref) |]
==
?. sam lose
?: con $(ref p.ref, axe (peg axe 3))
$(ref (peek(sut p.ref) way 2), axe (peg axe 6)) $(ref (peek(sut p.ref) way 2), axe (peg axe 6))
:: ::
{$cube *} {$cube *}
@ -8222,16 +8214,15 @@
:: ::
{$cnts *} {$cnts *}
=+ lar=(foil (seek %read p.gen)) =+ lar=(foil (seek %read p.gen))
=+ mew=(snub q.gen)
=- [(nice p.yom) ?:(=(0 p.q.lar) q.yom [%9 p.q.lar q.yom])] =- [(nice p.yom) ?:(=(0 p.q.lar) q.yom [%9 p.q.lar q.yom])]
^= yom ^= yom
=+ hej=*(list {p/axis q/nock}) =+ hej=*(list {p/axis q/nock})
|- ^- {p/span q/nock} |- ^- {p/span q/nock}
?~ mew ?~ q.gen
[(fire q.q.lar) (hike p.lar hej)] [(fire q.q.lar) (hike p.lar hej)]
=+ zil=^$(gen q.i.mew, gol %noun) =+ zil=^$(gen q.i.q.gen, gol %noun)
=+ wip=(tock p.i.mew p.zil q.q.lar) =+ wip=(toss p.i.q.gen p.zil q.q.lar)
$(mew t.mew, q.q.lar q.wip, hej [[p.wip q.zil] hej]) $(q.gen t.q.gen, q.q.lar q.wip, hej [[p.wip q.zil] hej])
:: ::
{$dtkt *} [(nice %noun) [%11 q:$(gen p.gen, gol %noun)]] {$dtkt *} [(nice %noun) [%11 q:$(gen p.gen, gol %noun)]]
{$dtls *} [(nice [%atom %$]) [%4 q:$(gen p.gen, gol [%atom %$])]] {$dtls *} [(nice [%atom %$]) [%4 q:$(gen p.gen, gol [%atom %$])]]
@ -8377,18 +8368,17 @@
=+ vug=(foil (seek(sut dox) %read p.gen)) =+ vug=(foil (seek(sut dox) %read p.gen))
?. &(=(p.lar p.vug) =(p.q.lar p.q.vug)) ?. &(=(p.lar p.vug) =(p.q.lar p.q.vug))
~|(%mull-bonk-e !!) ~|(%mull-bonk-e !!)
=+ mew=(snub q.gen)
=- [(nice (fire p.yom)) (fire(vet |) q.yom)] =- [(nice (fire p.yom)) (fire(vet |) q.yom)]
^= yom ^= yom
|- ^- {p/(list {p/span q/foot}) q/(list {p/span q/foot})} |- ^- {p/(list {p/span q/foot}) q/(list {p/span q/foot})}
?~ mew ?~ q.gen
[q.q.lar q.q.vug] [q.q.lar q.q.vug]
=+ zil=^$(gen q.i.mew, gol %noun) =+ zil=^$(gen q.i.q.gen, gol %noun)
=+ cuf=(tock p.i.mew p.zil q.q.lar) =+ cuf=(toss p.i.q.gen p.zil q.q.lar)
=+ dof=(tock p.i.mew q.zil q.q.vug) =+ dof=(toss p.i.q.gen q.zil q.q.vug)
?. .=(p.cuf p.dof) ?. .=(p.cuf p.dof)
~|(%mull-bonk-f !!) ~|(%mull-bonk-f !!)
$(mew t.mew, q.q.lar q.cuf, q.q.vug q.dof) $(q.gen t.q.gen, q.q.lar q.cuf, q.q.vug q.dof)
:: ::
{$dtkt *} =+($(gen p.gen, gol %noun) (beth %noun)) {$dtkt *} =+($(gen p.gen, gol %noun) (beth %noun))
{$dtls *} =+($(gen p.gen, gol [%atom %$]) (beth [%atom %$])) {$dtls *} =+($(gen p.gen, gol [%atom %$]) (beth [%atom %$]))
@ -8677,32 +8667,15 @@
== ==
-- --
:: ::
++ park ++ perk
~/ %park |= {way/?($read $rite $both $free) met/?($gold $iron $lead $zinc)}
|= {way/?($read $rite $both $free) axe/axis} ^- {sam/? con/?}
^- ? ?: ?=($gold met) [& &]
?> ?=({$core *} sut) ?- way
?| $both [| |]
!vet $free [& &]
?- way $read [?=($zinc met) |]
$both =(%gold p.q.sut) $rite [?=($iron met) |]
$free &
$read
?- p.q.sut
$gold &
$iron |
$lead |
$zinc =(2 (cap axe))
==
::
$rite
?- p.q.sut
$gold &
$iron =(2 (cap axe))
$lead |
$zinc |
==
==
== ==
:: ::
++ peek ++ peek
@ -8718,11 +8691,16 @@
{$atom *} %void {$atom *} %void
{$cell *} ?:(=(2 now) ^$(sut p.sut, axe lat) ^$(sut q.sut, axe lat)) {$cell *} ?:(=(2 now) ^$(sut p.sut, axe lat) ^$(sut q.sut, axe lat))
{$core *} {$core *}
?: =(3 now) ?. =(3 now) %noun
?. (park way lat) =+ pec=(perk way p.q.sut)
%noun %= ^$
^$(sut p.sut, axe lat) axe lat
%noun sut
?: =([& &] pec) p.sut
%+ cell
?.(sam.pec %noun ^$(sut p.sut, axe 2))
?.(con.pec %noun ^$(sut p.sut, axe 3))
==
:: ::
{$fork *} (fork $(sut p.sut) $(sut q.sut)) {$fork *} (fork $(sut p.sut) $(sut q.sut))
{$hold *} {$hold *}
@ -8744,13 +8722,12 @@
{^ *} (cell $(gen p.gen) $(gen q.gen)) {^ *} (cell $(gen p.gen) $(gen q.gen))
{$brcn *} (core sut %gold sut [[%0 0] p.gen]) {$brcn *} (core sut %gold sut [[%0 0] p.gen])
{$cnts *} =+ lar=(foil (seek %read p.gen)) {$cnts *} =+ lar=(foil (seek %read p.gen))
=+ mew=(snub q.gen)
=+ rag=q.q.lar =+ rag=q.q.lar
%- fire %- fire
|- ^- (list {p/span q/foot}) |- ^- (list {p/span q/foot})
?~ mew ?~ q.gen
rag rag
$(mew t.mew, rag q:(tock p.i.mew ^$(gen q.i.mew) rag)) $(q.gen t.q.gen, rag q:(toss p.i.q.gen ^$(gen q.i.q.gen) rag))
{$dtkt *} %noun {$dtkt *} %noun
{$dtls *} [%atom %$] {$dtls *} [%atom %$]
{$rock *} ?:(=(%f p.gen) ?>((lte q.gen 1) bool) [%atom p.gen]) {$rock *} ?:(=(%f p.gen) ?>((lte q.gen 1) bool) [%atom p.gen])
@ -8824,7 +8801,7 @@
:: :^ p.old %| p.q.old :: :^ p.old %| p.q.old
:: (~(tap in (~(gas in *(set (pair span foot))) q.q.old)) ~) :: (~(tap in (~(gas in *(set (pair span foot))) q.q.old)) ~)
~| [%seek-miss [way hyp] ~] ~| [%seek-miss [way hyp] ~]
=+ fid=(feel way hyp) =+ fid=(find way hyp)
?. ?=($& -.fid) ?. ?=($& -.fid)
~& [%seek-hyp hyp] ~& [%seek-hyp hyp]
~& [%seek-fid fid] ~& [%seek-fid fid]
@ -8852,7 +8829,7 @@
|= {way/?($read $rite $both $free) hyp/wing} |= {way/?($read $rite $both $free) hyp/wing}
^- vein ^- vein
~| [%need-wing hyp] ~| [%need-wing hyp]
=+ taf=(feel %rite hyp) =+ taf=(find %rite hyp)
?>(?=($& -.taf) p.p.taf) ?>(?=($& -.taf) p.p.taf)
:: ::
++ tonk ++ tonk
@ -8902,18 +8879,18 @@
== ==
:: ::
++ tack ++ tack
|= {peh/wing mur/span} |= {hyp/wing mur/span}
(tuck %rite (flop peh) |=(span mur)) (tuck %rite hyp |=(span mur))
:: ::
++ tock ++ toss
|= {peh/wing mur/span men/(list {p/span q/foot})} |= {hyp/wing mur/span men/(list {p/span q/foot})}
^- {p/axis q/(list {p/span q/foot})} ^- {p/axis q/(list {p/span q/foot})}
=- [(need p.wib) q.wib] =- [(need p.wib) q.wib]
^= wib ^= wib
|- ^- {p/(unit axis) q/(list {p/span q/foot})} |- ^- {p/(unit axis) q/(list {p/span q/foot})}
?~ men ?~ men
[*(unit axis) ~] [*(unit axis) ~]
=+ geq=(tack(sut p.i.men) peh mur) =+ geq=(tack(sut p.i.men) hyp mur)
=+ mox=$(men t.men) =+ mox=$(men t.men)
[(mate p.mox `_p.mox`[~ p.geq]) [[q.geq q.i.men] q.mox]] [(mate p.mox `_p.mox`[~ p.geq]) [[q.geq q.i.men] q.mox]]
:: ::
@ -9088,7 +9065,7 @@
== ==
== ==
:: ::
++ sail :: template language ++ sail :: xml template
|= tol/? =| lin/? |= tol/? =| lin/?
|% |%
++ ape :: product twig ++ ape :: product twig