ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2025-01-05 22:03:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

clay: fix %mime->%hoon bootstrapping

Browse Source
This commit is contained in:
Ted Blackman 2020-04-28 00:52:07 -04:00
parent 80541b39aa
commit 3eac215a1c
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/arvo/sys/vane/clay.hoon
View File

@ -2699,7 +2699,7 @@
++ get-value ++ get-value
|= =path |= =path
^- [cage state] ^- [cage state]
~| %error-validating-path^path ~| %error-validating^path
?^ got=(~(get by baked.nub) path) ?^ got=(~(get by baked.nub) path)
[u.got nub] [u.got nub]
=; [res=cage bun=state] =; [res=cage bun=state]
@ -2715,7 +2715,7 @@
[p.u.change nub] [p.u.change nub]
~| %ugly-lobe^p.u.change^path ~| %ugly-lobe^p.u.change^path
(lobe-to-page p.u.change) (lobe-to-page p.u.change)
=^ cage nub (validate-path path page) =^ cage nub (validate-page path page)
[cage nub] [cage nub]
?< (~(has in deletes) path) ?< (~(has in deletes) path)
:_(nub (need (~(get an ankh) path))) :_(nub (need (~(get an ankh) path)))
@ -2819,6 +2819,11 @@
|= [a=mark b=mark] |= [a=mark b=mark]
^- [tube state] ^- [tube state]
~| error-building-cast+[a b] ~| error-building-cast+[a b]
?: =([%mime %hoon] [a b])
:_ nub
|= sam=vase
=+ !<(=mime sam)
!>(q.q.mime)
?^ got=(~(get by casts.cache.nub) [a b]) ?^ got=(~(get by casts.cache.nub) [a b])
=? stack.nub ?=(^ stack.nub) =? stack.nub ?=(^ stack.nub)
stack.nub(i (~(uni in i.stack.nub) dez.u.got)) stack.nub(i (~(uni in i.stack.nub) dez.u.got))
@ -2882,9 +2887,10 @@
[[p q.q]:cage nub] [[p q.q]:cage nub]
== ==
:: ::
++ validate-path ++ validate-page
|= [=path =page] |= [=path =page]
^- [cage state] ^- [cage state]
~| validate-page-fail+path^from+p.page
=/ mak=mark (head (flop path)) =/ mak=mark (head (flop path))
?: =(mak p.page) ?: =(mak p.page)
(page-to-cage page) (page-to-cage page)
@ -2897,6 +2903,8 @@
^- [cage state] ^- [cage state]
?: =(%hoon p.page) ?: =(%hoon p.page)
:_(nub [%hoon -:!>(*@t) q.page]) :_(nub [%hoon -:!>(*@t) q.page])
?: =(%mime p.page)
:_(nub [%mime !>(;;(mime q.page))])
=^ =dais nub (get-mark p.page) =^ =dais nub (get-mark p.page)
:_(nub [p.page (vale:dais q.page)]) :_(nub [p.page (vale:dais q.page)])
:: ::
@ -3086,15 +3094,11 @@
?~ paz ~|(no-file+pre^pax !!) ?~ paz ~|(no-file+pre^pax !!)
=/ pux=path pre^(snoc i.paz %hoon) =/ pux=path pre^(snoc i.paz %hoon)
?: (~(has in deletes) pux) ?: (~(has in deletes) pux)
~& path-in-deletes+pux
$(paz t.paz) $(paz t.paz)
?: (~(has by changes) pux) ?: (~(has by changes) pux)
~& path-in-changes+pux
pux pux
?^ (~(get an ankh) pux) ?^ (~(get an ankh) pux)
~& path-in-ankh+pux
pux pux
~& path-not-in-ankh+pux
$(paz t.paz) $(paz t.paz)
-- --
-- --