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

New powers for $face.

Browse Source
This commit is contained in:
C. Guy Yarvin 2015-12-27 00:43:40 -05:00
parent 9831c6c606
commit 45b09f2c10
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ape/dojo.hoon
View File

@ -513,7 +513,7 @@
|- ^- $? $% {$atom @tas}
{$cell _$ _$}
{$cube * _$}
{$face @tas _$}
{$face tusk _$}
{$fork _$ _$}
{$hold (list {_$ twig})}
==

33
arvo/hoon.hoon
View File

@ -359,7 +359,7 @@
{$cell p/span q/span} :: ordered pair
{$core p/span q/coil} :: object
{$cube p/* q/span} :: constant
{$face p/term q/span} :: name
{$face p/tusk q/span} :: name
{$fork p/span q/span} :: union
{$hold p/(list {p/span q/twig})} :: lazy evaluation
== ::
@ -375,7 +375,12 @@
{$1 p/(list)} ::
{$2 p/(list {@ta *})} ::
== ::
++ tusk $@(term {$~ (list (pair term wing))}) :: generalized face
++ tusk :: general face control
$@ term :: simple label
$: p/(map term wing) :: aliases
q/(set term) :: blocks
r/(list (pair term twig)) :: bridges
== ::
++ twin {p/term q/wing r/axis s/span} :: alias info
++ typo span :: old span
++ udal :: atomic change (%b)
@ -6285,11 +6290,11 @@
::
++ face :: make %face span
~/ %face
|= {cog/term der/span}
|= {sag/tusk der/span}
^- span
?: =(%void der)
%void
[%face cog der]
[%face sag der]
::
++ bool ^-(span [%fork [%cube 0 %atom %f] [%cube 1 %atom %f]]) :: -:!>(*?)
++ flay
@ -7730,7 +7735,7 @@
::
{$face *}
=+ yad=$(sut q.sut)
[p.yad [%face p.sut q.yad]]
?^(p.sut yad [p.yad [%face p.sut q.yad]])
::
{$fork *}
?: =(p.sut fork+[cube+[%noun atom+%tas]]^[cube+[%void atom+%tas]])
@ -8011,11 +8016,25 @@
$(ref q.ref)
::
{$face *}
?: |(?=($~ q.heg) =(u.q.heg p.ref))
?@ p.ref
?: |(?=($~ q.heg) =(u.q.heg p.ref))
?. =(0 p.heg)
[%| %& (dec p.heg)]
[%& [~ `axe lon] %& q.ref]
lose
?~ q.heg
?. =(0 p.heg)
[%| %& (dec p.heg)]
[%& [~ `axe lon] %& q.ref]
lose
?: (~(has in q.p.ref) u.q.heg)
lose
=^ hit p.heg
=+ hit=(~(get by p.p.ref) u.q.heg)
?~ hit [~ p.heg]
?: =(0 p.heg) [hit 0] [~ (dec p.heg)]
?~ hit
$(ref q.ref, axe 1, lon [~ `axe lon])
^$(sut q.ref, hyp u.hit, nol [~ `axe lon])
::
{$fork *}
=+ [lef ryt]=[(~(has in gil) p.ref) (~(has in gil) q.ref)]