Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Tiger
havm
Commits
17e8235b
Commit
17e8235b
authored
Feb 19, 2020
by
Bruno BELANYI
Browse files
Merge branch 'bb/fix-fail-monad' into 'master'
Resolve "Cannot compile on GHC 8.8+" See merge request
!3
parents
eae0f88e
e3c722a6
Pipeline
#31826
passed with stage
in 2 minutes and 43 seconds
Changes
1
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
src/VMMonad.hs
View file @
17e8235b
{-# LANGUAGE CPP #-}
module
VMMonad
(
Mnd
,
run
,
lift
,
rfetch
,
rstore
,
rpush
,
rpop
,
...
...
@@ -24,6 +26,7 @@ import Memory (Memory)
import
Annotation
(
Ann
)
import
Opt
(
OptVal
)
import
Control.Monad
(
ap
,
liftM
)
-- Control.Monad.Fail import has become redundant in GHC 8.8+
import
qualified
Control.Monad.Fail
as
Fail
import
qualified
Cpu
(
initialize
,
rfetch
,
rstore
,
rpush
,
rpop
)
import
qualified
Code
(
initialize
,
cload
,
cfind
,
cstore
,
cfetch
)
...
...
@@ -62,7 +65,10 @@ instance Monad Mnd where
do
x
<-
c
r
case
f
x
of
(
Mnd
c'
)
->
c'
r
#
if
!
(
MIN_VERSION_base
(
4
,
13
,
0
))
-- Monad(fail) is removed in GHC 8.8+
fail
=
Fail
.
fail
#
endif
instance
Fail
.
MonadFail
Mnd
where
fail
=
error
"fail: invalid pattern matching"
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment