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

Still bedeviled by some devulc bugs.

Browse Source
This commit is contained in:
C. Guy Yarvin 2016-01-06 17:47:03 -08:00
parent 1b721c5f25
commit 6101ab9a17
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arvo/ford.hoon
View File

@ -1161,7 +1161,8 @@
:: ::
++ lima :: load at depth ++ lima :: load at depth
|= {cof/cafe for/mark bem/beam arg/heel} |= {cof/cafe for/mark bem/beam arg/heel}
%+ (clef %bake) [p=cof q=[%0 p=[bem `~] q=[for bem arg]]] %+ (clef %bake)
`(bolt {mark beam heel})`[cof [%0 [bem ~ ~] [for bem arg]]]
|= {cof/cafe for/mark bem/beam arg/heel} |= {cof/cafe for/mark bem/beam arg/heel}
^- (bolt (unit vase)) ^- (bolt (unit vase))
%+ cope (laze cof bem) %+ cope (laze cof bem)
@ -1791,7 +1792,7 @@
?@ q.gar ?@ q.gar
=+ for=((sand %tas) q.gar) =+ for=((sand %tas) q.gar)
?~ for (flaw cof leaf+"bad mark ++grad" ~) ?~ for (flaw cof leaf+"bad mark ++grad" ~)
(make cof %cast p.cay %pact [%cast u.for %$ cay] %$ coy) (make cof `silk`[%cast p.cay %pact [%cast u.for %$ cay] %$ coy])
?. (slab %form p.gar) ?. (slab %form p.gar)
(flaw cof leaf+"no ++form:grad" ~) (flaw cof leaf+"no ++form:grad" ~)
=+ for=((soft @tas) q:(slap gar [%limb %form])) =+ for=((soft @tas) q:(slap gar [%limb %form]))

13
arvo/hoon.hoon
View File

@ -7104,13 +7104,14 @@
{$cnkt *} [%cnhp p.gen q.gen r.gen s.gen ~] {$cnkt *} [%cnhp p.gen q.gen r.gen s.gen ~]
{$cnls *} [%cnhp p.gen q.gen r.gen ~] {$cnls *} [%cnhp p.gen q.gen r.gen ~]
{$cnhp *} [%cnsg [%$ ~] p.gen q.gen] {$cnhp *} [%cnsg [%$ ~] p.gen q.gen]
{$cnsg *} {$cnsg *} :: [%cntr p.gen q.gen (hail(gen [%cltr r.gen]) 6)]
:^ %cntr p.gen q.gen :^ %cntr p.gen q.gen
:: ?:(=(~ r.gen) ~ (hail(gen [%cltr r.gen]) 6))
=+ axe=6 =+ axe=6
|- ^- (list {wing twig}) |- ^- (list {wing twig})
?~ r.gen ~ ?~ r.gen ~
?~ t.r.gen [[[[%| 0 ~] [%& axe] ~] i.r.gen] ~] ?~ t.r.gen [[[[%| 0 ~] [%& axe] ~] i.r.gen] ~]
:- [[[%| 0 ~] [%& (peg axe 2)] ~] i.r.gen] :- [[[%| 0 ~] [%& (peg axe 2)] ~] i.r.gen]
$(axe (peg axe 3), r.gen t.r.gen) $(axe (peg axe 3), r.gen t.r.gen)
:: ::
{$cntr *} {$cntr *}
@ -7666,6 +7667,8 @@
=- [p.tez (doge q.p.tez q.tez)] =- [p.tez (doge q.p.tez q.tez)]
^= tez ^= tez
^- {p/{p/(map span @) q/(map @ wine)} q/wine} ^- {p/{p/(map span @) q/(map @ wine)} q/wine}
?: (~(meet ut sut) -:!>(*span))
[dex %span]
?- sut ?- sut
$noun [dex sut] $noun [dex sut]
$void [dex sut] $void [dex sut]
@ -7714,8 +7717,6 @@
?^(p.sut yad [p.yad [%face p.sut q.yad]]) ?^(p.sut yad [p.yad [%face p.sut q.yad]])
:: ::
{$fork *} {$fork *}
?: =(p.sut fork+[%atom %tas `%noun]^[%atom %tas `%void])
[dex %span] :: XX proper print
=+ hin=$(sut p.sut) =+ hin=$(sut p.sut)
=+ yon=$(dex p.hin, sut q.sut) =+ yon=$(dex p.hin, sut q.sut)
:- p.yon :- p.yon
@ -8727,7 +8728,9 @@
{$cell *} ?: =(2 now) {$cell *} ?: =(2 now)
(cell $(sut p.sut, u.i.vit lat) q.sut) (cell $(sut p.sut, u.i.vit lat) q.sut)
(cell p.sut $(sut q.sut, u.i.vit lat)) (cell p.sut $(sut q.sut, u.i.vit lat))
{$core *} ?>(=(3 now) (core $(sut p.sut, u.i.vit lat) q.sut)) {$core *} ?. =(3 now)
(cell %noun p.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 *} ?: (~(has in vil) sut) {$fork *} ?: (~(has in vil) sut)
%void %void