strip VResult before storing value in REPLDone
#978
Conversation
| -- Log exceptions in the message queue so we can check for them in tests | ||
| Left exn -> do | ||
| let h = hypotheticalRobot (Out VUnit emptyStore []) 0 | ||
| em <- use entityMap | ||
| m <- evalState @Robot h $ createLogEntry ErrorTrace (formatExn em exn) | ||
| emitMessage m | ||
| Right (VBool res) -> when res markWin | ||
| Right (VResult (VBool res) _env) -> when res markWin |
There was a problem hiding this comment.
#927 continues to accrue merge conflicts in this part of the code (see previous comment).
There was a problem hiding this comment.
@kostmo if you are OK with letting me push to your branch, I can fix it for you. 😉
We have a historic number of open PRs now, so I will try to close mine and review and help where I can.
Afterwards, we should make a release, there is a lot of cool stuff to share. 👍
src/Swarm/Game/Value.hs
Outdated
| @@ -87,6 +88,11 @@ data Value where | |||
| VRef :: Int -> Value | |||
| deriving (Eq, Show, Generic, FromJSON, ToJSON) | |||
|
|
|||
| -- | Ensure that a value is not wrapped in 'VResult'. | |||
| stripVResult :: Value -> Value | |||
| stripVResult (VResult v _) = v | |||
There was a problem hiding this comment.
Just to make sure, there is no way a VResult could contain a VResult, right?
There was a problem hiding this comment.
Uhh... well, it's not supposed to, but it's a good question. We might as well make stripVResult recursive, just in case.
| -- Log exceptions in the message queue so we can check for them in tests | ||
| Left exn -> do | ||
| let h = hypotheticalRobot (Out VUnit emptyStore []) 0 | ||
| em <- use entityMap | ||
| m <- evalState @Robot h $ createLogEntry ErrorTrace (formatExn em exn) | ||
| emitMessage m | ||
| Right (VBool res) -> when res markWin | ||
| Right (VResult (VBool res) _env) -> when res markWin |
There was a problem hiding this comment.
@kostmo if you are OK with letting me push to your branch, I can fix it for you. 😉
We have a historic number of open PRs now, so I will try to close mine and review and help where I can.
Afterwards, we should make a release, there is a lot of cool stuff to share. 👍
Fixes #977.