diff options
| author | Inari Listenmaa <inari.listenmaa@gmail.com> | 2025-08-02 18:59:07 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-08-02 18:59:07 +0200 |
| commit | 65e85c5a3cba4df82547a018b4135ac63551d8df (patch) | |
| tree | 33a842b24b9e3851c6b6cf095f11f562b0fd6b7f /src/server | |
| parent | 981d6b9bddacee6a204ac48f2a4e27f4cca1bd47 (diff) | |
| parent | 01c4f82e077b93cb2318830c56070c0ec15a20e6 (diff) | |
Merge pull request #175 from inariksit/new-ghc
Changes to make it work with newer stack/GHC:
- unix library changed API in 2.8
- Monad of no return & Semigroup as a superclass of Monoid
- import Control.Monad (join, when, (<=<))
- fixed CI issues
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/CGIUtils.hs | 5 | ||||
| -rw-r--r-- | src/server/PGFService.hs | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/server/CGIUtils.hs b/src/server/CGIUtils.hs index 3c5ce2274..0a04c3a6f 100644 --- a/src/server/CGIUtils.hs +++ b/src/server/CGIUtils.hs @@ -34,8 +34,13 @@ stderrToFile :: FilePath -> IO () stderrToFile file = do let mode = ownerReadMode<>ownerWriteMode<>groupReadMode<>otherReadMode (<>) = unionFileModes +#if MIN_VERSION_unix(2,8,0) + flags = defaultFileFlags { append = True, creat = Just mode } + fileFd <- openFd file WriteOnly flags +#else flags = defaultFileFlags { append = True } fileFd <- openFd file WriteOnly (Just mode) flags +#endif dupTo fileFd stdError return () #else diff --git a/src/server/PGFService.hs b/src/server/PGFService.hs index 260c2e278..bcf3d32f2 100644 --- a/src/server/PGFService.hs +++ b/src/server/PGFService.hs @@ -448,7 +448,7 @@ pgfMain lcs@(alc,clc) path command tpgf@(t,pgf) = "linearizeTable" -> o =<< doLinearizeTabular pgf # tree % to "random" -> o =<< join (doRandom pgf # cat % depth % limit % to) "generate" -> o =<< doGenerate pgf # cat % depth % limit % to - "translate" -> o =<< doTranslate pgf # input % cat %to%limit%treeopts + "translate" -> o =<< doTranslate pgf # input % cat % to % limit % treeopts "translategroup" -> o =<< doTranslateGroup pgf # input % cat % to % limit "lookupmorpho" -> o =<< doLookupMorpho pgf # from1 % textInput "grammar" -> join $ doGrammar tpgf @@ -1092,7 +1092,7 @@ linearizeTabular pgf (tos,unlex) tree = [(to,lintab to (transfer to tree)) | to <- langs] where langs = if null tos then PGF.languages pgf else tos - lintab to t = [(p,map unlex (nub [t|(p',t)<-vs,p'==p]))|p<-ps] + lintab to t = [(p,map unlex (nub [t | (p',t)<-vs,p'==p])) | p<-ps] where ps = nub (map fst vs) vs = concat (PGF.tabularLinearizes pgf to t) |