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

%fuss entirely shifted to %face.

Browse Source
This commit is contained in:
C. Guy Yarvin 2016-01-16 16:47:36 -08:00
parent dacc5eadc1
commit 6b613ff81b
2 changed files with 2 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ape/dojo.hoon
View File

@ -515,7 +515,6 @@
{$cell _$ _$} {$cell _$ _$}
{$cube * _$} {$cube * _$}
{$face $@(term tool) _$} {$face $@(term tool) _$}
{$fuss $@(term tool) _$}
{$fork (set _$)} {$fork (set _$)}
{$hold _$ twig} {$hold _$ twig}
== ==
@ -523,7 +522,7 @@
$?($noun $void) $?($noun $void)
== ==
?+ a a ?+ a a
{?($cube $face $fuss) ^} a(q $(a q.a)) {?($cube $face) ^} a(q $(a q.a))
{$cell ^} a(p $(a p.a), q $(a q.a)) {$cell ^} a(p $(a p.a), q $(a q.a))
{$fork *} a(p (silt (turn (~(tap in p.a)) |=(b/span ^$(a b))))) {$fork *} a(p (silt (turn (~(tap in p.a)) |=(b/span ^$(a b)))))
{$core ^} `wain`/core {$core ^} `wain`/core

48
arvo/hoon.hoon
View File

@ -349,7 +349,6 @@
{$cell p/span q/span} :: ordered pair {$cell p/span q/span} :: ordered pair
{$core p/span q/coil} :: object {$core p/span q/coil} :: object
{$face p/$@(term tool) q/span} :: namespace (new) {$face p/$@(term tool) q/span} :: namespace (new)
{$fuss p/$@(term tool) q/span} :: namespace (new)
{$fork p/(set span)} :: union {$fork p/(set span)} :: union
{$hold p/span q/twig} :: lazy evaluation {$hold p/span q/twig} :: lazy evaluation
== :: == ::
@ -7717,10 +7716,6 @@
{$face *} {$face *}
=+ yad=$(sut q.sut) =+ yad=$(sut q.sut)
?^(p.sut yad [p.yad [%face p.sut q.yad]]) ?^(p.sut yad [p.yad [%face p.sut q.yad]])
::
{$fuss *}
=+ yad=$(sut q.sut)
?^(p.sut yad [p.yad [%face p.sut q.yad]])
:: ::
{$fork *} {$fork *}
=+ yed=(~(tap in p.sut)) =+ yed=(~(tap in p.sut))
@ -7803,7 +7798,6 @@
|=(* (biff ^$(sut q.sut) |=(* `[+>+< +<]))) |=(* (biff ^$(sut q.sut) |=(* `[+>+< +<])))
{$core *} (biff $(sut p.sut) |=(* `[p.r.q.sut +<])) {$core *} (biff $(sut p.sut) |=(* `[p.r.q.sut +<]))
{$face *} $(sut repo) {$face *} $(sut repo)
{$fuss *} $(sut repo)
{$fork *} =+ yed=(~(tap in p.sut)) {$fork *} =+ yed=(~(tap in p.sut))
|- ^- (unit) |- ^- (unit)
?~ yed ~ ?~ yed ~
@ -7890,7 +7884,6 @@
:: ::
{$core *} ?:(?=(?({$atom *} {$cell *}) ref) sut sint) {$core *} ?:(?=(?({$atom *} {$cell *}) ref) sut sint)
{$face *} (face p.sut dext(sut q.sut)) {$face *} (face p.sut dext(sut q.sut))
{$fuss *} (face p.sut dext(sut q.sut))
{$fork *} (fork (turn (~(tap in p.sut)) |=(span dext(sut +<)))) {$fork *} (fork (turn (~(tap in p.sut)) |=(span dext(sut +<))))
{$hold *} ?< (~(has in bix) [sut ref]) {$hold *} ?< (~(has in bix) [sut ref])
dext(sut repo, bix (~(put in bix) [sut ref])) dext(sut repo, bix (~(put in bix) [sut ref]))
@ -7903,7 +7896,6 @@
?+ ref !! ?+ ref !!
{$core *} sut {$core *} sut
{$face *} dext(ref repo(sut ref)) {$face *} dext(ref repo(sut ref))
{$fuss *} dext(ref repo(sut ref))
{$fork *} =+ yed=(~(tap in p.ref)) {$fork *} =+ yed=(~(tap in p.ref))
|- ^- span |- ^- span
?~ yed sut ?~ yed sut
@ -8116,37 +8108,6 @@
=+ vat=(fine (ride fid) ~) =+ vat=(fine (ride fid) ~)
[%| %| p.vat (comb q.vat (comb [%0 axe] q.i.q.p.ref))] [%| %| p.vat (comb q.vat (comb [%0 axe] q.i.q.p.ref))]
-- --
::
{$fuss *}
?: ?=($~ q.heg) here(ref q.ref)
?@ p.ref
?:(=(u.q.heg p.ref) here(ref q.ref) lose)
=< main
|%
++ fear $(ref q.ref, lon [~ lon])
++ main
^- pony
=% tyr/(unit (unit tart)) (~(get by p.p.ref) u.q.heg)
?~ tyr
next
?~ u.tyr
fear(p.heg +(p.heg))
?. =(0 p.heg)
next(p.heg (dec p.heg))
?- -.u.u.tyr
$& [%& (weld p.p.u.u.tyr `vein`[~ `axe lon]) q.p.u.u.tyr]
$| [%| %| p.p.u.u.tyr (comb [%0 axe] q.p.u.u.tyr)]
==
++ next
|- ^- pony
?~ q.p.ref
^$(ref q.ref, lon [~ lon])
=+ fid=^$(ref p.i.q.p.ref, lon ~, axe 1)
?: ?=({$| $& *} fid)
$(q.p.ref t.q.p.ref, p.heg p.p.fid)
=+ vat=(fine (ride fid) ~)
[%| %| p.vat (comb q.vat (comb [%0 axe] q.i.q.p.ref))]
--
:: ::
{$fork *} {$fork *}
=+ yed=(~(tap in p.ref)) =+ yed=(~(tap in p.ref))
@ -8225,7 +8186,6 @@
:: ::
{$core *} [%0 0] {$core *} [%0 0]
{$face *} $(sut q.sut) {$face *} $(sut q.sut)
{$fuss *} $(sut q.sut)
{$fork *} =+ yed=(~(tap in p.sut)) {$fork *} =+ yed=(~(tap in p.sut))
|- ^- nock |- ^- nock
?~(yed [%1 1] (flor ^$(sut i.yed) $(yed t.yed))) ?~(yed [%1 1] (flor ^$(sut i.yed) $(yed t.yed)))
@ -8265,7 +8225,6 @@
:: ::
{$core *} $(sut repo) {$core *} $(sut repo)
{$face *} (face p.sut $(sut q.sut)) {$face *} (face p.sut $(sut q.sut))
{$fuss *} (face p.sut $(sut q.sut))
{$fork *} (fork (turn (~(tap in p.sut)) |=(span ^$(sut +<)))) {$fork *} (fork (turn (~(tap in p.sut)) |=(span ^$(sut +<))))
{$hold *} {$hold *}
?: (~(has in bix) [sut ref]) ?: (~(has in bix) [sut ref])
@ -8456,7 +8415,6 @@
{$cell *} |($(sut p.sut) $(sut q.sut)) {$cell *} |($(sut p.sut) $(sut q.sut))
{$core *} $(sut p.sut) {$core *} $(sut p.sut)
{$face *} $(sut q.sut) {$face *} $(sut q.sut)
{$fuss *} $(sut q.sut)
{$fork *} (lien (~(tap in p.sut)) |=(span ^$(sut +<))) {$fork *} (lien (~(tap in p.sut)) |=(span ^$(sut +<)))
{$hold *} |((~(has in gil) sut) $(gil (~(put in gil) sut), sut repo)) {$hold *} |((~(has in gil) sut) $(gil (~(put in gil) sut), sut repo))
$noun | $noun |
@ -8686,7 +8644,6 @@
== == == ==
== ==
{$face *} dext(sut q.sut) {$face *} dext(sut q.sut)
{$fuss *} dext(sut q.sut)
{$fork *} ?. ?=(?({$atom *} $noun {$cell *} {$core *}) ref) sint {$fork *} ?. ?=(?({$atom *} $noun {$cell *} {$core *}) ref) sint
(lien (~(tap in p.sut)) |=(span dext(tel |, sut +<))) (lien (~(tap in p.sut)) |=(span dext(tel |, sut +<)))
{$hold *} ?: (~(has in seg) sut) | {$hold *} ?: (~(has in seg) sut) |
@ -8707,7 +8664,6 @@
{$cell *} | {$cell *} |
{$core *} dext(ref repo(sut ref)) {$core *} dext(ref repo(sut ref))
{$face *} dext(ref q.ref) {$face *} dext(ref q.ref)
{$fuss *} dext(ref q.ref)
{$fork *} (levy (~(tap in p.ref)) |=(span sint(ref +<))) {$fork *} (levy (~(tap in p.ref)) |=(span sint(ref +<)))
{$hold *} ?: (~(has in reg) ref) & {$hold *} ?: (~(has in reg) ref) &
?: (~(has in gil) [sut ref]) & ?: (~(has in gil) [sut ref]) &
@ -8820,7 +8776,6 @@
?- sut ?- sut
{$core *} [%cell %noun p.sut] {$core *} [%cell %noun p.sut]
{$face *} q.sut {$face *} q.sut
{$fuss *} q.sut
{$hold *} (rest [[p.sut q.sut] ~]) {$hold *} (rest [[p.sut q.sut] ~])
$noun (fork [%atom %$ ~] [%cell %noun %noun] ~) $noun (fork [%atom %$ ~] [%cell %noun %noun] ~)
* ~|(%repo-fltt !!) * ~|(%repo-fltt !!)
@ -8869,7 +8824,6 @@
?~ i.vit ?~ i.vit
|- ^- span |- ^- span
?+ sut ^$(vit t.vit) ?+ sut ^$(vit t.vit)
{$fuss *} (face p.sut ^$(vit t.vit, sut q.sut))
{$face *} (face p.sut ^$(vit t.vit, sut q.sut)) {$face *} (face p.sut ^$(vit t.vit, sut q.sut))
{$fork *} (fork (turn (~(tap in p.sut)) |=(span ^$(sut +<)))) {$fork *} (fork (turn (~(tap in p.sut)) |=(span ^$(sut +<))))
{$hold *} $(sut repo) {$hold *} $(sut repo)
@ -8890,7 +8844,6 @@
$(sut repo) $(sut repo)
(core $(sut p.sut, u.i.vit lat) q.sut) (core $(sut p.sut, u.i.vit lat) q.sut)
{$face *} (face p.sut $(sut q.sut)) {$face *} (face p.sut $(sut q.sut))
{$fuss *} (face p.sut $(sut q.sut))
{$fork *} (fork (turn (~(tap in p.sut)) |=(span ^$(sut +<)))) {$fork *} (fork (turn (~(tap in p.sut)) |=(span ^$(sut +<))))
{$hold *} ?: (~(has in vil) sut) {$hold *} ?: (~(has in vil) sut)
%void %void
@ -8931,7 +8884,6 @@
{$cell *} (cell $(sut p.sut) $(sut q.sut)) {$cell *} (cell $(sut p.sut) $(sut q.sut))
{$core *} ?>(|(=(%gold p.q.sut) =(%lead yoz)) sut(p.q yoz)) {$core *} ?>(|(=(%gold p.q.sut) =(%lead yoz)) sut(p.q yoz))
{$face *} (face p.sut $(sut q.sut)) {$face *} (face p.sut $(sut q.sut))
{$fuss *} (face p.sut $(sut q.sut))
{$fork *} (fork (turn (~(tap in p.sut)) |=(span ^$(sut +<)))) {$fork *} (fork (turn (~(tap in p.sut)) |=(span ^$(sut +<))))
{$hold *} $(sut repo) {$hold *} $(sut repo)
== ==