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

Remove funky semantics from %bull.

Browse Source
This commit is contained in:
C. Guy Yarvin 2015-12-26 23:58:07 -05:00
parent fc30af8593
commit 9831c6c606
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
arvo/hoon.hoon
View File

@ -375,7 +375,7 @@
{$1 p/(list)} :: {$1 p/(list)} ::
{$2 p/(list {@ta *})} :: {$2 p/(list {@ta *})} ::
== :: == ::
:: ++ tusk $@(term {~ (list (pair term wing))}) :: generalized face ++ tusk $@(term {$~ (list (pair term wing))}) :: generalized face
++ twin {p/term q/wing r/axis s/span} :: alias info ++ twin {p/term q/wing r/axis s/span} :: alias info
++ typo span :: old span ++ typo span :: old span
++ udal :: atomic change (%b) ++ udal :: atomic change (%b)
@ -6260,7 +6260,7 @@
++ bull :: make %bull span ++ bull :: make %bull span
|= {bid/twin der/span} |= {bid/twin der/span}
^- span ^- span
?:(|(=(%void der) =(%void s.bid)) %void [%bull bid der]) ?:(=(%void der) %void [%bull bid der])
:: ::
++ cain |=(vax/vase (sell vax)) :: $+(vase tank) for /> ++ cain |=(vax/vase (sell vax)) :: $+(vase tank) for />
++ cell :: make %cell span ++ cell :: make %cell span
@ -7681,7 +7681,7 @@
$noun [dex sut] $noun [dex sut]
$void [dex sut] $void [dex sut]
{$atom *} [dex [%mato p.sut]] {$atom *} [dex [%mato p.sut]]
{$bull *} $(sut q.sut) :: something better here {$bull *} $(sut q.sut)
{$cell *} {$cell *}
=+ hin=$(sut p.sut) =+ hin=$(sut p.sut)
=+ yon=$(dex p.hin, sut q.sut) =+ yon=$(dex p.hin, sut q.sut)
@ -7830,7 +7830,7 @@
~/ %busk ~/ %busk
|= {cog/term hyp/wing} |= {cog/term hyp/wing}
^- span ^- span
(bull [cog hyp (seep %both hyp)] sut) (bull [cog hyp 0 %void] sut)
:: ::
++ conk ++ conk
|= got/toga |= got/toga
@ -8081,7 +8081,7 @@
|- ^- ? |- ^- ?
?- sut ?- sut
{$atom *} !.?(dib) {$atom *} !.?(dib)
{$bull *} &($(sut q.sut) $(sut s.p.sut, dib .*(dib [0 r.p.sut]))) {$bull *} $(sut q.sut)
{$cell *} &(.?(dib) $(sut p.sut, dib -.dib) $(sut q.sut, dib +.dib)) {$cell *} &(.?(dib) $(sut p.sut, dib -.dib) $(sut q.sut, dib +.dib))
{$core *} {$core *}
?& .?(dib) ?& .?(dib)
@ -8110,7 +8110,7 @@
$void [%1 1] $void [%1 1]
$noun [%1 0] $noun [%1 0]
{$atom *} (flip [%3 %0 axe]) {$atom *} (flip [%3 %0 axe])
{$bull *} ~|(%bull-fish !!) {$bull *} $(sut q.sut)
{$cell *} {$cell *}
%+ flan %+ flan
[%3 %0 axe] [%3 %0 axe]
@ -8634,10 +8634,7 @@
=(p.sut p.ref) =(p.sut p.ref)
sint sint
:: ::
{$bull *} {$bull *} dext(sut q.sut)
?& dext(sut q.sut)
dext(sut s.p.sut, ref (peek(sut ref) %free r.p.sut))
==
{$face *} dext(sut q.sut) {$face *} dext(sut q.sut)
{$fork *} {$fork *}
?. ?=(?({$atom *} $noun {$cell *} {$cube *} {$core *}) ref) ?. ?=(?({$atom *} $noun {$cell *} {$cube *} {$core *}) ref)