diff --git a/gen/ivory.hoon b/gen/ivory.hoon index 937ce347b..392be4c13 100644 --- a/gen/ivory.hoon +++ b/gen/ivory.hoon @@ -39,21 +39,21 @@ =+ whole-formula=q:(~(mint ut %noun) %noun whole-hoon) ~& %ivory-compiled :: -:: tang: standard library (%zuse) installation event +:: zuse-ovo: standard library installation event :: -=/ tang +=/ zuse-ovo=ovum =/ pax (weld sys /zuse) =/ txt .^(@ %cx (weld pax /hoon)) - `ovum`[/vane/zuse [%veer %$ pax txt]] + [/vane/zuse [%veer %$ pax txt]] :: -:: installed: kernel with tang installed +:: installed: Arvo gate (formal instance) with %zuse installed :: -~& %tang-installing +~& %zuse-installing =/ installed - .*(0 [%7 whole-formula [%9 2 %10 [6 %1 now tang] %0 1]]) -~& %tang-installed + .*(0 [%7 whole-formula [%9 2 %10 [6 %1 now zuse-ovo] %0 1]]) +~& %zuse-installed :: -:: produce both whole-formula (for jet registration) -:: and a kernel with the standard library already installed +:: produce a formula that evaluates :whole-formula (for jet registration), +:: then ignores that result and produces :installed :: [%7 whole-formula %1 installed] diff --git a/gen/solid.hoon b/gen/solid.hoon index 387d86c2a..179212407 100644 --- a/gen/solid.hoon +++ b/gen/solid.hoon @@ -12,7 +12,7 @@ :- %say |= $: [now=@da eny=@uvJ bec=beak] arg=$@(~ [top=path ~]) - dub/_| + dub=_| == :- %noun :: sys: root path to boot system, `/~me/[desk]/now/sys` @@ -27,9 +27,6 @@ =/ compiler-src .^(@t %cx (weld compiler-path /hoon)) =/ arvo-src .^(@t %cx (weld arvo-path /hoon)) =/ arvo-formula - =; res - ?:(?=(%& -.res) p.res (mean (flop p.res))) - %- mule |. ~& %solid-loaded =/ compiler-hoon (rain compiler-path compiler-src) ?. dub @@ -79,7 +76,7 @@ =/ txt .^(@ %cx (weld pax /hoon)) [[%vane den] [%veer abr pax txt]] -- -:: arvo with vanes installed +:: installed: Arvo gate (formal interface) with %zuse and vanes installed :: =/ installed =< q @@ -88,7 +85,9 @@ .*(0 arvo-formula) |= [ovo=ovum ken=*] [~ .*(ken [%9 2 %10 [6 %1 now ovo] %0 1])] -:: produce both the arvo-formula (for jet registration) -:: and a kernel with the vanes already installed +:: +:: produce a pair of :arvo-formula (for jet registration) and +:: the Arvo core (structural interface), which is the context +:: of the formal Arvo interface gate :installed :: [arvo-formula .*(installed [%0 7])]