From 1037b209ae225d5de604ff832d915c590ced4c38 Mon Sep 17 00:00:00 2001 From: Inari Listenmaa Date: Mon, 9 Sep 2024 19:38:27 +0200 Subject: add whitespace on list comprehensions, applications etc. text editor interprets these things as errors (e.g. unterminated qq for list comprehension) and underlines red, even though there is no real error. --- src/server/PGFService.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server') 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) -- cgit v1.2.3 From bbf12458c7c4b783897851f7e0bddea54f2d984e Mon Sep 17 00:00:00 2001 From: Inari Listenmaa Date: Mon, 9 Sep 2024 19:44:49 +0200 Subject: use openFd from unix >= 2.8 --- gf.cabal | 2 +- src/server/CGIUtils.hs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/server') diff --git a/gf.cabal b/gf.cabal index 21093ae0b..a0b0c01dd 100644 --- a/gf.cabal +++ b/gf.cabal @@ -347,7 +347,7 @@ library else build-depends: terminfo >=0.4.0 && < 0.5, - unix >= 2.7.2 && < 2.8 + unix >= 2.8 if impl(ghc>=8.2) ghc-options: -fhide-source-paths diff --git a/src/server/CGIUtils.hs b/src/server/CGIUtils.hs index 3c5ce2274..b593a2b07 100644 --- a/src/server/CGIUtils.hs +++ b/src/server/CGIUtils.hs @@ -34,8 +34,8 @@ stderrToFile :: FilePath -> IO () stderrToFile file = do let mode = ownerReadMode<>ownerWriteMode<>groupReadMode<>otherReadMode (<>) = unionFileModes - flags = defaultFileFlags { append = True } - fileFd <- openFd file WriteOnly (Just mode) flags + flags = defaultFileFlags { append = True, creat = Just mode } + fileFd <- openFd file WriteOnly flags dupTo fileFd stdError return () #else -- cgit v1.2.3 From 155b9da861fc95e55ec3352e7beb45eba5f41812 Mon Sep 17 00:00:00 2001 From: Inari Listenmaa Date: Thu, 20 Mar 2025 17:54:41 +0100 Subject: choose openFd based on version of unix --- src/server/CGIUtils.hs | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/server') diff --git a/src/server/CGIUtils.hs b/src/server/CGIUtils.hs index b593a2b07..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 -- cgit v1.2.3