msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

fix compilation with older GHC versions

Browse Source
This commit is contained in:
Krasimir Angelov
2022-11-10 19:19:19 +01:00
parent 5ca00ded84
commit 9214f2a074
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/compiler/GF/Command/Commands.hs
View File

@@ -43,7 +43,7 @@ instance (Monad m,HasPGF m,Fail.MonadFail m) => TypeCheckArg m where
(inferExpr pgf e)
Nothing -> fail "Import a grammar before using this command"
pgfCommands :: (HasPGF m, MonadFail m) => Map.Map String (CommandInfo m)
pgfCommands :: (HasPGF m, Fail.MonadFail m) => Map.Map String (CommandInfo m)
pgfCommands = Map.fromList [
("aw", emptyCommandInfo {
longname = "align_words",

8
src/compiler/GF/Compile/Compute/Concrete.hs
View File

@@ -584,11 +584,19 @@ instance Functor ConstValue where
instance Applicative ConstValue where
pure = Const
(Const f) <*> (Const x) = Const (f x)
NonExist <*> _ = NonExist
_ <*> NonExist = NonExist
RunTime <*> _ = RunTime
_ <*> RunTime = RunTime
#if MIN_VERSION_base(4,10,0)
liftA2 f (Const a) (Const b) = Const (f a b)
liftA2 f NonExist _ = NonExist
liftA2 f _ NonExist = NonExist
liftA2 f RunTime _ = RunTime
liftA2 f _ RunTime = RunTime
#endif
value2string v = fmap (unwords.snd) (value2string v False [])
where