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

Jets are still using frogs; h.h is double-solid %fork.

Browse Source
This commit is contained in:
C. Guy Yarvin 2016-01-11 01:48:41 -08:00
parent e2cd7f3629
commit 65a4f70214
1 changed files with 43 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
arvo/hoon.hoon
View File

@ -6276,7 +6276,7 @@
%void %void
[%face sag der] [%face sag der]
:: ::
++ bool `span`[%frog [%atom %f `0] [%atom %f `1] ~] ++ bool `span`[%frog [%atom %f `0] [%atom %f `1] ~] :: make loobeal
++ frog :: make %frog span ++ frog :: make %frog span
~/ %frog ~/ %frog
|= yed/(list span) |= yed/(list span)
@ -6285,7 +6285,8 @@
?~ yed ?~ yed
?~ lez %void ?~ lez %void
?: ?=({* $~ $~} lez) n.lez ?: ?=({* $~ $~} lez) n.lez
[%frog (~(tap in `(set span)`lez))] :: [%frog (~(tap in `(set span)`lez))]
[%fork lez]
$(yed t.yed, lez ?:(=(%void i.yed) lez (~(put in lez) i.yed))) $(yed t.yed, lez ?:(=(%void i.yed) lez (~(put in lez) i.yed)))
:: ::
++ grof |=((set span) [%frog (~(tap in +<))]) ++ grof |=((set span) [%frog (~(tap in +<))])
@ -7706,7 +7707,16 @@
=+ 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]])
:: ::
{$fork *} $(sut ~(repo ut sut)) {$fork *}
=+ yed=(~(tap in p.sut))
=- [p [%pick q]]
|- ^- {p/{p/(map span @) q/(map @ wine)} q/(list wine)}
?~ yed
[dex ~]
=+ mor=$(yed t.yed)
=+ dis=^$(dex p.mor, sut i.yed)
[p.dis q.dis q.mor]
::
{$frog *} {$frog *}
=- [p [%pick q]] =- [p [%pick q]]
|- ^- {p/{p/(map span @) q/(map @ wine)} q/(list wine)} |- ^- {p/{p/(map span @) q/(map @ wine)} q/(list wine)}
@ -7784,7 +7794,7 @@
{$cell *} [$(sut p.sut) $(sut q.sut)] {$cell *} [$(sut p.sut) $(sut q.sut)]
{$core *} [p.r.q.sut $(sut p.sut)] {$core *} [p.r.q.sut $(sut p.sut)]
{$face *} $(sut repo) {$face *} $(sut repo)
{$fork *} $(sut repo) {$fork *} $(sut -.p.sut)
{$frog *} $(sut -.p.sut) {$frog *} $(sut -.p.sut)
{$hold *} ?: (~(has in gil) sut) {$hold *} ?: (~(has in gil) sut)
~_ (dunk %span) ~_ (dunk %span)
@ -7846,7 +7856,7 @@
:: ::
{$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))
{$fork *} dext(sut repo) {$fork *} (frog (turn (~(tap in p.sut)) |=(span dext(sut +<))))
{$frog *} (frog (turn p.sut |=(span dext(sut +<)))) {$frog *} (frog (turn 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]))
@ -7859,7 +7869,10 @@
?+ ref !! ?+ ref !!
{$core *} sut {$core *} sut
{$face *} dext(ref repo(sut ref)) {$face *} dext(ref repo(sut ref))
{$fork *} dext(ref repo(sut ref)) {$fork *} =+ yed=(~(tap in p.ref))
|- ^- span
?~ yed sut
$(yed t.yed, sut dext(ref i.yed))
{$frog *} |- ^- span {$frog *} |- ^- span
?~ p.ref sut ?~ p.ref sut
$(p.ref t.p.ref, sut dext(ref i.p.ref)) $(p.ref t.p.ref, sut dext(ref i.p.ref))
@ -8058,7 +8071,18 @@
$(ref q.ref, axe 1, lon [~ `axe lon]) $(ref q.ref, axe 1, lon [~ `axe lon])
^$(sut q.ref, hyp u.hit, nol [~ `axe lon]) ^$(sut q.ref, hyp u.hit, nol [~ `axe lon])
:: ::
{$fork *} $(ref repo(sut ref)) {$fork *}
=+ yed=(~(tap in p.ref))
=+ ^= wiz |- ^- (list pony)
?~ yed ~
=+ mor=$(yed t.yed)
?: (~(has in gil) i.yed) mor
[^$(ref i.yed) mor]
?~ wiz [%| %& p.heg]
|- ^- pony
?~ t.wiz i.wiz
(twin i.wiz $(wiz t.wiz))
::
{$frog *} {$frog *}
=+ ^= wiz |- ^- (list pony) =+ ^= wiz |- ^- (list pony)
?~ p.ref ~ ?~ p.ref ~
@ -8125,7 +8149,9 @@
:: ::
{$core *} [%0 0] {$core *} [%0 0]
{$face *} $(sut q.sut) {$face *} $(sut q.sut)
{$fork *} $(sut repo) {$fork *} =+ yed=(~(tap in p.sut))
|- ^- nock
?~(yed [%1 1] (flor ^$(sut i.yed) $(yed t.yed)))
{$frog *} |- ^- nock {$frog *} |- ^- nock
?~(p.sut [%1 1] (flor ^$(sut i.p.sut) $(p.sut t.p.sut))) ?~(p.sut [%1 1] (flor ^$(sut i.p.sut) $(p.sut t.p.sut)))
{$hold *} {$hold *}
@ -8164,7 +8190,7 @@
:: ::
{$core *} $(sut repo) {$core *} $(sut repo)
{$face *} (face p.sut $(sut q.sut)) {$face *} (face p.sut $(sut q.sut))
{$fork *} $(sut repo) {$fork *} (frog (turn (~(tap in p.sut)) |=(span ^$(sut +<))))
{$frog *} (frog (turn p.sut |=(span ^$(sut +<)))) {$frog *} (frog (turn p.sut |=(span ^$(sut +<))))
{$hold *} {$hold *}
?: (~(has in bix) [sut ref]) ?: (~(has in bix) [sut ref])
@ -8352,7 +8378,7 @@
{$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)
{$fork *} $(sut repo) {$fork *} (lien (~(tap in p.sut)) |=(span ^$(sut +<)))
{$frog *} (lien p.sut |=(span ^$(sut +<))) {$frog *} (lien 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 |
@ -8575,7 +8601,8 @@
== == == ==
== ==
{$face *} dext(sut q.sut) {$face *} dext(sut q.sut)
{$fork *} dext(sut repo) {$fork *} ?. ?=(?({$atom *} $noun {$cell *} {$core *}) ref) sint
(lien (~(tap in p.sut)) |=(span dext(tel |, sut +<)))
{$frog *} ?. ?=(?({$atom *} $noun {$cell *} {$core *}) ref) sint {$frog *} ?. ?=(?({$atom *} $noun {$cell *} {$core *}) ref) sint
(lien p.sut |=(span dext(tel |, sut +<))) (lien p.sut |=(span dext(tel |, sut +<)))
{$hold *} ?: (~(has in seg) sut) | {$hold *} ?: (~(has in seg) sut) |
@ -8596,7 +8623,7 @@
{$cell *} | {$cell *} |
{$core *} dext(ref repo(sut ref)) {$core *} dext(ref repo(sut ref))
{$face *} dext(ref q.ref) {$face *} dext(ref q.ref)
{$fork *} sint(ref repo(sut ref)) {$fork *} (levy (~(tap in p.ref)) |=(span sint(ref +<)))
{$frog *} (levy p.ref |=(span sint(ref +<))) {$frog *} (levy 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]) &
@ -8642,7 +8669,7 @@
?.(con.pec %noun ^$(sut p.sut, axe 3)) ?.(con.pec %noun ^$(sut p.sut, axe 3))
== ==
:: ::
{$fork *} $(sut repo) {$fork *} (frog (turn (~(tap in p.sut)) |=(span ^$(sut +<))))
{$frog *} (frog (turn p.sut |=(span ^$(sut +<)))) {$frog *} (frog (turn p.sut |=(span ^$(sut +<))))
{$hold *} {$hold *}
?: (~(has in gil) sut) ?: (~(has in gil) sut)
@ -8757,7 +8784,7 @@
|- ^- span |- ^- span
?+ sut ^$(vit t.vit) ?+ sut ^$(vit t.vit)
{$face *} (face p.sut ^$(vit t.vit, sut q.sut)) {$face *} (face p.sut ^$(vit t.vit, sut q.sut))
{$fork *} $(sut repo) {$fork *} (frog (turn (~(tap in p.sut)) |=(span ^$(sut +<))))
{$frog *} (frog (turn p.sut |=(span ^$(sut +<)))) {$frog *} (frog (turn p.sut |=(span ^$(sut +<))))
{$hold *} $(sut repo) {$hold *} $(sut repo)
== ==
@ -8777,7 +8804,7 @@
$(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))
{$fork *} $(sut repo) {$fork *} (frog (turn (~(tap in p.sut)) |=(span ^$(sut +<))))
{$frog *} (frog (turn p.sut |=(span ^$(sut +<)))) {$frog *} (frog (turn p.sut |=(span ^$(sut +<))))
{$hold *} ?: (~(has in vil) sut) {$hold *} ?: (~(has in vil) sut)
%void %void
@ -8818,7 +8845,7 @@
{$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))
{$fork *} $(sut repo) {$fork *} (frog (turn (~(tap in p.sut)) |=(span ^$(sut +<))))
{$frog *} (frog (turn p.sut |=(span ^$(sut +<)))) {$frog *} (frog (turn p.sut |=(span ^$(sut +<))))
{$hold *} $(sut repo) {$hold *} $(sut repo)
== ==