From 9ae28a985cbcafc4c9c9aec44f0e1eb41cde6856 Mon Sep 17 00:00:00 2001 From: Joe Bryan Date: Tue, 4 Apr 2023 15:06:51 -0400 Subject: [PATCH] clay: %pass %drip with context, expect and handle errors in +take --- pkg/arvo/sys/vane/clay.hoon | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/pkg/arvo/sys/vane/clay.hoon b/pkg/arvo/sys/vane/clay.hoon index 27491080c..b443b5903 100644 --- a/pkg/arvo/sys/vane/clay.hoon +++ b/pkg/arvo/sys/vane/clay.hoon @@ -1384,7 +1384,7 @@ `[[care.mood case.mood syd] path.mood cage]:[u.res syd=syd] ?~ ref [%give %writ riot] - [%slip %b %drip !>([%writ riot])] + [%pass /drip %b %drip !>([%writ riot])] :: ++ case-to-date |= =case @@ -3781,7 +3781,7 @@ (~(run in moods) |=(m=mood [care.m path.m])) =/ gift [%wris cas res] ?: ?=(^ ref) - [%slip %b %drip !>(gift)] + [%pass /drip %b %drip !>(gift)] :: XX s/b [%behn %wris ...] in $sign? [%give gift] ?> ?=([* ~ ~] res) :_ ~ @@ -5753,7 +5753,25 @@ |= [tea=wire hen=duct dud=(unit goof) hin=sign] ^+ [*(list move) ..^$] ?^ dud - ~|(%clay-take-dud (mean tang.u.dud)) + ?+ tea + ~|(%clay-take-dud (mean tang.u.dud)) + :: + [%drip ~] + %. [~ ..^$] + %- slog + ^- tang + :* 'clay: drip fail' + [%rose [": " "" ""] 'bail' mote.u.dud ~] + tang.u.dud + == + == + :: + :: pseudo %slip on %drip + :: + ?: ?=([%drip ~] tea) + ?> ?=([?(%behn %clay) ?(%writ %wris) *] hin) + [[`move`[hen %give +.hin] ~] ..^$] + :: ?: ?=([%lu %load *] tea) ?> ?=(%unto +<.hin) ?> ?=(%poke-ack -.p.hin) @@ -5909,7 +5927,7 @@ ~(tap in ducts) =/ cancel-moves=(list move) %+ turn cancel-ducts - |=(=duct [duct %slip %b %drip !>([%writ ~])]) + |=(=duct [duct %pass /drip %b %drip !>([%writ ~])]) :: delete local state of foreign desk :: =. hoy.ruf (~(del by hoy.ruf) who)