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

With new type printer.

Browse Source
This commit is contained in:
C. Guy Yarvin 2015-12-09 15:24:29 -08:00
parent 402cc8a920
commit 98b873cf4e
2 changed files with 99 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arvo/ford.hoon
View File

@ -1895,7 +1895,7 @@
~ ~
:: ::
++ load :: highly forgiving ++ load :: highly forgiving
|= old=axle |= old=*
:: ..^$(+>- old) :: ..^$(+>- old)
..^$ ..^$
::=. old ::=. old

160
arvo/hoon.hoon
View File

@ -6662,7 +6662,7 @@
^- {? worm} ^- {? worm}
?: (~(has in nes) [sut ref]) [& +>+<] ?: (~(has in nes) [sut ref]) [& +>+<]
?. (~(nest ut sut) | ref) ?. (~(nest ut sut) | ref)
:: ~& %nest-failed ~& %wa-nest-failed
[| +>+<] [| +>+<]
[& +>+<(nes (~(put in nes) [sut ref]))] [& +>+<(nes (~(put in nes) [sut ref]))]
:: ::
@ -6672,14 +6672,15 @@
?: (~(has in nes) [sut ref]) [& +>+<] ?: (~(has in nes) [sut ref]) [& +>+<]
=+ gat=|=({a+type b+type} (~(nest ut a) | b)) =+ gat=|=({a+type b+type} (~(nest ut a) | b))
?. (? .*(gat(+< [sut ref]) -.gat)) ?. (? .*(gat(+< [sut ref]) -.gat))
:: ~& %nets-failed ~& %nets-failed
:: =+ tag=`*`skol =+ tag=`*`skol
:: =+ foo=(tank .*(tag(+< ref) -.tag)) =+ foo=(tank .*(tag(+< ref) -.tag))
:: =+ bar=(skol sut) =+ bar=(skol sut)
:: ~& %nets-need ~& %nets-need
:: ~> %slog.[0 bar] ~> %slog.[0 bar]
:: ~& %nets-have ~& %nets-have
:: ~> %slog.[0 foo] ~> %slog.[0 foo]
~& %nets-done
[| +>+<.$] [| +>+<.$]
[& +>+<.$(nes (~(put in nes) [sut ref]))] [& +>+<.$(nes (~(put in nes) [sut ref]))]
:: ::
@ -7601,58 +7602,75 @@
++ dial ++ dial
|= ham+calf |= ham+calf
=+ gid=*(set @ud) =+ gid=*(set @ud)
|- ^- tank =< `tank`-:$
?- q.ham |%
$noun [%leaf '*' ~] ++ many
$path [%leaf '/' ~] |= haz=(list wine)
$type [%leaf '#' 't' ~] ^- {(list tank) (set @ud)}
$void [%leaf '#' ~] ?~ haz [~ gid]
$wool [%leaf '*' '"' '"' ~] =^ mor gid $(haz t.haz)
$wall [%leaf '*' '\'' '\'' ~] =^ dis gid ^$(q.ham i.haz)
$yarn [%leaf '"' '"' ~] [[dis mor] gid]
{$atom *} [%leaf '@' (trip p.q.ham)]
{$core *}
:+ %rose
[[' ' ~] ['<' ~] ['>' ~]]
|- ^- (list tank)
?~ p.q.ham
[^$(q.ham q.q.ham) ~]
[[%leaf (rip 3 i.p.q.ham)] $(p.q.ham t.p.q.ham)]
:: ::
{$face *} ++ $
[%palm [['=' ~] ~ ~ ~] [%leaf (trip p.q.ham)] $(q.ham q.q.ham) ~] ^- {tank (set @ud)}
:: ?- q.ham
{$list *} $noun :_(gid [%leaf '*' ~])
[%rose [" " (weld (trip p.q.ham) "(") ")"] $(q.ham q.q.ham) ~] $path :_(gid [%leaf '/' ~])
:: $type :_(gid [%leaf '#' 't' ~])
{$pick *} $void :_(gid [%leaf '#' ~])
:+ %rose $wool :_(gid [%leaf '*' '"' '"' ~])
[[' ' ~] ['{' ~] ['}' ~]] $wall :_(gid [%leaf '*' '\'' '\'' ~])
|- ^- (list tank) $yarn :_(gid [%leaf '"' '"' ~])
?~(p.q.ham ~ [^$(q.ham i.p.q.ham) $(p.q.ham t.p.q.ham)]) {$atom *} :_(gid [%leaf '@' (trip p.q.ham)])
:: {$core *}
{$plot *} =^ cox gid $(q.ham q.q.ham)
:+ %rose :_ gid
[[' ' ~] ['[' ~] [']' ~]] :+ %rose
|- ^- (list tank) [[' ' ~] ['<' ~] ['>' ~]]
?~(p.q.ham ~ [^$(q.ham i.p.q.ham) $(p.q.ham t.p.q.ham)]) |- ^- (list tank)
:: ?~ p.q.ham [cox ~]
{$pear *} [[%leaf (rip 3 i.p.q.ham)] $(p.q.ham t.p.q.ham)]
[%leaf '%' ~(rend co [~ p.q.ham q.q.ham])] ::
:: {$face *}
{$stop *} =^ cox gid $(q.ham q.q.ham)
?: (~(has in gid) p.q.ham) :_(gid [%palm [['=' ~] ~ ~ ~] [%leaf (trip p.q.ham)] cox ~])
[%leaf '$' ~(rend co [~ %ud p.q.ham])] ::
:+ %palm {$list *}
[['.' ~] ['^' '$' ~(rend co [~ %ud p.q.ham])] ~ ~] =^ cox gid $(q.ham q.q.ham)
[$(gid (~(put in gid) p.q.ham), q.ham (need (~(get by p.ham) p.q.ham))) ~] :_(gid [%rose [" " (weld (trip p.q.ham) "(") ")"] cox ~])
:: ::
{$tree *} {$pick *}
[%rose [" " (weld (trip p.q.ham) "(") ")"] $(q.ham q.q.ham) ~] =^ coz gid (many p.q.ham)
:: :_(gid [%rose [[' ' ~] ['{' ~] ['}' ~]] coz])
{$unit *} ::
[%rose [" " (weld (trip p.q.ham) "(") ")"] $(q.ham q.q.ham) ~] {$plot *}
== =^ coz gid (many p.q.ham)
:_(gid [%rose [[' ' ~] ['[' ~] [']' ~]] coz])
::
{$pear *}
:_(gid [%leaf '%' ~(rend co [~ p.q.ham q.q.ham])])
::
{$stop *}
=+ num=~(rend co [~ %ud p.q.ham])
?: (~(has in gid) p.q.ham)
:_(gid [%leaf '$' num])
=^ cox gid
%= $
gid (~(put in gid) p.q.ham)
q.ham (~(got by p.ham) p.q.ham)
==
:_(gid [%palm [['.' ~] ['^' '$' num] ~ ~] cox ~])
::
{$tree *}
=^ cox gid $(q.ham q.q.ham)
:_(gid [%rose [" " (weld (trip p.q.ham) "(") ")"] cox ~])
::
{$unit *}
=^ cox gid $(q.ham q.q.ham)
:_(gid [%rose [" " (weld (trip p.q.ham) "(") ")"] cox ~])
==
--
:: ::
++ dish ++ dish
|= {ham+calf lum+*} ^- tank |= {ham+calf lum+*} ^- tank
@ -10576,7 +10594,17 @@
=+ rev=(slym (slap bud (rain pax txt)) bud) =+ rev=(slym (slap bud (rain pax txt)) bud)
=+ syg=(slym rev arg) =+ syg=(slym rev arg)
~| %load-lost ~| %load-lost
+>.$(q.sew (slam (slap syg [%cnzy %load]) (slap rig [%cnzy %stay]))) :: ~& %ruck-testing
=+ old=(slap rig [%cnzy %stay])
=+ new=(slap syg [%cnzy %load])
=+ sam=(~(peek ut p.new) %free 6)
~? !(~(nest ut sam) | p.old) %ruck-fail
:: :: ~> %slog.[0 (skol old)]
:: :: ~> %slog.[0 (skol sam)]
:: :: =+ foo=(~(nest ut sam) & old)
:: !!
~& %ruck-good
+>.$(q.sew (slam new old))
:: ::
++ wink :: deploy ++ wink :: deploy
|= {now+@da eny+@ ski+slad} |= {now+@da eny+@ ski+slad}
@ -10612,7 +10640,14 @@
{$&} (~(nest wa p.sew) p.sam p.p.hil) {$&} (~(nest wa p.sew) p.sam p.p.hil)
{$|} (~(nets wa p.sew) p.sam p.p.hil) {$|} (~(nets wa p.sew) p.sam p.p.hil)
== ==
?.(-.hig ~ `[(slym gat +>.hil) +.hig]) ?. -.hig
?- -.hil
{$&} ~& [%raw-nest (~(nest ut p.sam) | p.p.hil)]
~
{$|} ~&(%slur-no-nets ~)
==
~& [%slur-did -.hig]
`[(slym gat +>.hil) +.hig]
:: ::
++ slur-a ~/(%slur-a |=({gat+vase hil+mill} =+(%a (slur gat hil)))) ++ slur-a ~/(%slur-a |=({gat+vase hil+mill} =+(%a (slur gat hil))))
++ slur-b ~/(%slur-b |=({gat+vase hil+mill} =+(%b (slur gat hil)))) ++ slur-b ~/(%slur-b |=({gat+vase hil+mill} =+(%b (slur gat hil))))
@ -10764,6 +10799,7 @@
=+ ^= pru =+ ^= pru
?~ pux ?~ pux
~| [%swim-call-vane lal ({term $~} +.p.hil)] ~| [%swim-call-vane lal ({term $~} +.p.hil)]
~& [%swim-call-vane lal ({term $~} +.p.hil)]
=^ vax p.sew (~(slap wa p.sew) rig [%cnzy %call]) =^ vax p.sew (~(slap wa p.sew) rig [%cnzy %call])
%^ slur-pro lal vax %^ slur-pro lal vax
(slid [%& duc.vil hen] (slix hil)) (slid [%& duc.vil hen] (slix hil))