diff --git a/pkg/arvo/sys/arvo.hoon b/pkg/arvo/sys/arvo.hoon index df866a7f1..a63269508 100644 --- a/pkg/arvo/sys/arvo.hoon +++ b/pkg/arvo/sys/arvo.hoon @@ -1263,7 +1263,7 @@ :: =/ raw ~> %slog.[0 leaf+"vega: compiling hoon"] - (ride %noun u.hun) + (mure |.((ride %noun u.hun))) :: activate the new compiler gate, producing +ride :: =/ cop .*(0 +.raw) @@ -1274,12 +1274,14 @@ ?> |(=(nex hoon-version) =(+(nex) hoon-version)) :: if we're upgrading language versions, recompile the compiler :: - => ?: =(nex hoon-version) - [hot=`*`raw .] - ~> %slog.[0 leaf+"vega: recompiling hoon {}k"] - ~& [%hoon-compile-upgrade nex] - =/ hot (slum cop [%noun hun]) - .(cop .*(0 +.hot)) + =^ hot=* cop + ?: =(nex hoon-version) + [raw cop] + ~> %slog.[0 leaf+"vega: recompiling hoon {}k"] + ~& [%hoon-compile-upgrade nex] + %- mure |. + =/ hot (slum cop [%noun hun]) + [hot .*(0 +.hot)] :: extract the hoon core from the outer gate (+ride) :: =/ hoc .*(cop [%0 7]) @@ -1292,6 +1294,7 @@ :: =/ rav ~> %slog.[0 leaf+"vega: compiling kernel {(scow %p (mug hyp))}"] + %- mure |. (slum cop [hyp van]) :: activate arvo, and extract the arvo core from the outer gate :: diff --git a/pkg/arvo/sys/hoon.hoon b/pkg/arvo/sys/hoon.hoon index 4bec14bce..50f3d301b 100644 --- a/pkg/arvo/sys/hoon.hoon +++ b/pkg/arvo/sys/hoon.hoon @@ -12035,6 +12035,15 @@ ?~ a !! ~_(i.a $(a t.a)) :: +++ mure + |* =(trap *) + ^+ $:trap + =/ res (mule trap) + ?- -.res + %& p.res + %| (mean leaf+"mure: road" p.res) + == +:: ++ slew :: get axis in vase |= {axe/@ vax/vase} ^- (unit vase) ?. |- ^- ? diff --git a/pkg/arvo/sys/vane/clay.hoon b/pkg/arvo/sys/vane/clay.hoon index d14592625..e160638bf 100644 --- a/pkg/arvo/sys/vane/clay.hoon +++ b/pkg/arvo/sys/vane/clay.hoon @@ -379,7 +379,6 @@ `[(weld pax pat) %mime !>(u.mim)] :: [deletes changes] -:: -- => ~% %clay + ~ |% @@ -757,7 +756,7 @@ =^ sut=vase nub (run-tauts sut %lib lib.pile) =^ sut=vase nub (run-raw sut raw.pile) =^ sut=vase nub (run-bar sut bar.pile) - =/ res=vase (slap sut hoon.pile) + =/ res=vase (mure |.((slap sut hoon.pile))) [res nub] :: ++ parse-pile @@ -1545,6 +1544,7 @@ zuse.u.fer :: ++ build-hoon + %- mure |. ~> %slog.0^leaf+"clay: building hoon on {}" =/ gen ~> %mean.%hoon-parse-fail @@ -1554,6 +1554,7 @@ :: ++ build-arvo |= hoon=vase + %- mure |. ~> %slog.0^leaf+"clay: building arvo on {}" =/ gen ~> %mean.%arvo-parse-fail @@ -1563,6 +1564,7 @@ :: ++ build-zuse |= arvo=vase + %- mure |. ~> %slog.0^leaf+"clay: building zuse on {}" =/ gen ~> %mean.%zuse-parse-fail diff --git a/pkg/arvo/sys/vane/gall.hoon b/pkg/arvo/sys/vane/gall.hoon index 93bc674b2..eeea1970d 100644 --- a/pkg/arvo/sys/vane/gall.hoon +++ b/pkg/arvo/sys/vane/gall.hoon @@ -1,4 +1,4 @@ -!: :: %gall, agent execution +:: :: %gall, agent execution !? 163 :: ::::