Skip to content

Commit 4a1c7d1

Browse files
committed
Add default options unless some option prints something
1 parent 6b25630 commit 4a1c7d1

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

MainUDGF.hs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import PGF
1717
import System.Environment (getArgs)
1818
import Control.Concurrent
1919
import Control.Monad
20-
import Data.List(sortOn)
20+
import Data.List(sortOn, (\\))
2121
import Data.Char(isDigit)
2222

2323
-- to get parallel processing:
@@ -225,10 +225,12 @@ helpMsg = unlines $ [
225225
] ++ [" " ++ opt ++ "\t" ++ msg | (opt,msg) <- fullOpts]
226226

227227
convertGFUD :: String -> Opts -> UDEnv -> IO ()
228-
convertGFUD dir opts env = case dir of
229-
"ud2gf" -> getContents >>= ud2gfOpts (if null opts then defaultOptsUD2GF else opts) env
230-
"ud2gfparallel" -> getContents >>= ud2gfOptsPar (if null opts then defaultOptsUD2GF else opts) env
231-
_ -> do
228+
convertGFUD dir opts env =
229+
let optsU2G = if null (opts \\ nonPrintingOpts) then opts ++ defaultOptsUD2GF else opts
230+
in case dir of
231+
"ud2gf" -> getContents >>= ud2gfOpts optsU2G env
232+
"ud2gfparallel" -> getContents >>= ud2gfOptsPar optsU2G env
233+
_ -> do
232234
s <- getContents
233235
let conv = case dir of
234236
"gf2ud" -> G.testTreeString

UDOptions.hs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ module UDOptions where
55
-- ud2gf
66
minimalOptsUD2GF = selectOpts ["at"]
77
defaultOptsUD2GF = selectOpts ["msg","ud","err","bt0","at","tc","lin","sum","stat"]
8+
nonPrintingOpts = selectOpts ["no-backups"]
89

910
-- gf2ud
1011
minimalOptsGF2UD = selectOpts ["ud"]

0 commit comments

Comments
 (0)