eyre: use static mark conversions

This commit is contained in:
Logan Allen 2021-05-20 12:11:45 -05:00
parent c0e4dcdc18
commit 306dbbaead

View File

@ -1642,17 +1642,16 @@
:: ::
=* have=mark p.cage.sign =* have=mark p.cage.sign
=* desc=tape "from {(trip have)} to json" =* desc=tape "from {(trip have)} to json"
=/ tube=(unit tube:clay) =/ convert=(unit $-(* json))
=/ tuc=(unit (unit cage)) =/ cag=(unit (unit cage))
(rof ~ %cc [our %home da+now] /[have]/json) (rof ~ %cf [our %home da+now] /[have]/json)
?. ?=([~ ~ *] tuc) ~ ?. ?=([~ ~ *] cag) ~
`!<(tube:clay q.u.u.tuc) `!<($-(* json) q.u.u.cag)
?~ tube ?~ convert
((slog leaf+"eyre: no tube {desc}" ~) [~ ~]) ((slog leaf+"eyre: no convert {desc}" ~) [~ ~])
:: =/ res (mule |.((u.convert q.cage.sign)))
=/ res (mule |.((u.tube q.cage.sign)))
?: ?=(%& -.res) ?: ?=(%& -.res)
[`have `[%fact %json p.res]] [`have `[%fact %json !>(p.res)]]
((slog leaf+"eyre: failed tube {desc}" ~) [~ ~]) ((slog leaf+"eyre: failed tube {desc}" ~) [~ ~])
:: ::
?~ q.jsyn ~ ?~ q.jsyn ~
@ -1660,7 +1659,7 @@
:_ ?~ p.jsyn ~ :_ ?~ p.jsyn ~
:_ ~ :_ ~
:^ duct %pass /pass/(scot %ud request-id) :^ duct %pass /pass/(scot %ud request-id)
[%c %warp our %home `[%sing %c da+now /[u.p.jsyn]/json]] [%c %warp our %home `[%sing %f da+now /[u.p.jsyn]/json]]
=* sign u.q.jsyn =* sign u.q.jsyn
=, enjs:format =, enjs:format
%- pairs %- pairs