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

Merge pull request #3103 from urbit/philip/dojo-errors

Browse Source 
dojo: add tags to identify errors
This commit is contained in:
Philip Monk 2020-07-07 17:39:30 -07:00 committed by GitHub
commit 8e0f5dd294
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/arvo/app/dojo.hoon
View File

@ -683,7 +683,8 @@
~|(%one-argument !!) ~|(%one-argument !!)
=/ res (mule |.((slam q.cay (dy-vase p.i.p.cig)))) =/ res (mule |.((slam q.cay (dy-vase p.i.p.cig))))
?: ?=(%| -.res) ?: ?=(%| -.res)
(he-diff(poy ~) %tan p.res) :: TODO: or +dy-rash ? :: TODO: or +dy-rash ?
(he-diff(poy ~) %tan leaf+"dojo: naked generator failure" p.res)
(dy-hand %noun p.res) (dy-hand %noun p.res)
:: normal generator :: normal generator
:: ::
@ -697,7 +698,7 @@
:: ::
=/ wat (mule |.(!<(?(%ask %say) (slot 2 q.cay)))) =/ wat (mule |.(!<(?(%ask %say) (slot 2 q.cay))))
?: ?=(%| -.wat) ?: ?=(%| -.wat)
(he-diff(poy ~) %tan p.wat) (he-diff(poy ~) %tan leaf+"dojo: generator neither %ask nor %say" p.wat)
=- =/ res (mule -) =- =/ res (mule -)
?: ?=(%| -.res) ?: ?=(%| -.res)
(he-diff(poy ~) %tan leaf+"dojo: generator failure" p.res) (he-diff(poy ~) %tan leaf+"dojo: generator failure" p.res)
@ -811,10 +812,10 @@
%do %do
=/ gat (dy-eval p.bil) =/ gat (dy-eval p.bil)
?: ?=(%| -.gat) ?: ?=(%| -.gat)
(he-diff(poy ~) %tan p.gat) (he-diff(poy ~) %tan leaf+"dojo: %do create gate failed" p.gat)
=/ res (mule |.((slam q.p.gat (dy-vase p.q.bil)))) =/ res (mule |.((slam q.p.gat (dy-vase p.q.bil))))
?: ?=(%| -.res) ?: ?=(%| -.res)
(he-diff(poy ~) %tan p.res) (he-diff(poy ~) %tan leaf+"dojo: %do execute failed" p.res)
(dy-hand %noun p.res) (dy-hand %noun p.res)
:: ::
%tu %tu
@ -848,7 +849,7 @@
|= =hoon |= =hoon
=/ res (dy-eval hoon) =/ res (dy-eval hoon)
?: ?=(%| -.res) ?: ?=(%| -.res)
(he-diff(poy ~) %tan p.res) (he-diff(poy ~) %tan leaf+"dojo: hoon expression failed" p.res)
(dy-hand p.res) (dy-hand p.res)
:: +dy-eval: run hoon source against the dojo subject :: +dy-eval: run hoon source against the dojo subject
:: ::
@ -975,7 +976,7 @@
+> +>
?~ p.cit ?~ p.cit
(he-diff %txt ">=") (he-diff %txt ">=")
(he-diff %tan u.p.cit) (he-diff %tan leaf+"dojo: app poke failed" u.p.cit)
:: ::
++ he-wool ++ he-wool
|= [way=wire =sign:agent:gall] |= [way=wire =sign:agent:gall]
@ -984,13 +985,13 @@
%poke-ack %poke-ack
?~ p.sign ?~ p.sign
+>.$ +>.$
=. +>.$ (he-diff(poy ~) %tan u.p.sign) =. +>.$ (he-diff(poy ~) %tan leaf+"dojo: thread poke failed" u.p.sign)
(he-card %pass /wool %agent [our.hid %spider] %leave ~) (he-card %pass /wool %agent [our.hid %spider] %leave ~)
:: ::
%watch-ack %watch-ack
?~ p.sign ?~ p.sign
+>.$ +>.$
(he-diff(poy ~) %tan u.p.sign) (he-diff(poy ~) %tan leaf+"dojo: thread watch failed" u.p.sign)
:: ::
%fact %fact
?+ p.cage.sign ~|([%dojo-thread-bad-mark-result p.cage.sign] !!) ?+ p.cage.sign ~|([%dojo-thread-bad-mark-result p.cage.sign] !!)