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

Re-converged ford with dojo.

Browse Source
This commit is contained in:
C. Guy Yarvin 2015-03-05 14:58:04 -08:00
parent 8fbb779a7a
commit 46f4f89183
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arvo/hoon.hoon
View File

@ -6176,7 +6176,9 @@
|= [sut=type ref=type] |= [sut=type ref=type]
^- [? worm] ^- [? worm]
?: (~(has in nes) [sut ref]) [& +>+<] ?: (~(has in nes) [sut ref]) [& +>+<]
?. (~(nest ut sut) | ref) [| +>+<] ?. (~(nest ut sut) | ref)
:: ~& %nest-failed
[| +>+<]
[& +>+<(nes (~(put in nes) [sut ref]))] [& +>+<(nes (~(put in nes) [sut ref]))]
:: ::
++ nets :: typeless nest ++ nets :: typeless nest
@ -6185,6 +6187,14 @@
?: (~(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
:: =+ tag=`*`skol
:: =+ foo=(tank .*(tag(+< ref) -.tag))
:: =+ bar=(skol sut)
:: ~& %nets-need
:: ~> %slog.[0 bar]
:: ~& %nets-have
:: ~> %slog.[0 foo]
[| +>+<.$] [| +>+<.$]
[& +>+<.$(nes (~(put in nes) [sut ref]))] [& +>+<.$(nes (~(put in nes) [sut ref]))]
:: ::

5
main/app/dojo/core.hook
View File

@ -71,7 +71,7 @@
[%dub p=term q=horn] :: /= apply face [%dub p=term q=horn] :: /= apply face
[%fan p=(list horn)] :: /. list [%fan p=(list horn)] :: /. list
[%for p=path q=horn] :: /, descend [%for p=path q=horn] :: /, descend
[%hel p=horn] :: /% propagate heel [%hel p=@ud q=horn] :: /% propagate heel
[%hub p=horn] :: /@ list by @ud [%hub p=horn] :: /@ list by @ud
[%man p=(map span horn)] :: /* hetero map [%man p=(map span horn)] :: /* hetero map
[%nap p=horn] :: /_ homo map [%nap p=horn] :: /_ homo map
@ -81,7 +81,7 @@
[%sic p=tile q=horn] :: /^ cast [%sic p=tile q=horn] :: /^ cast
[%toy p=mark] :: /mark/ static [%toy p=mark] :: /mark/ static
== :: == ::
++ silk :: from %ford ++ silk :: construction layer
$& [p=silk q=silk] :: cons $& [p=silk q=silk] :: cons
$% [%bake p=mark q=beam r=path] :: local synthesis $% [%bake p=mark q=beam r=path] :: local synthesis
[%boil p=mark q=beam r=path] :: general synthesis [%boil p=mark q=beam r=path] :: general synthesis
@ -323,6 +323,7 @@
:: ::
++ he-pass ++ he-pass
|= [pax=path noy=note] |= [pax=path noy=note]
~& [%he-pass pax noy]
%_(+> moz [[ost %pass pax noy] moz]) %_(+> moz [[ost %pass pax noy] moz])
:: ::
++ he-rush :: emit update ++ he-rush :: emit update