on master help sign in
Merge branch 'suhorng-master'
commitc64f2c2c99025c5241b82f3c666d5288ae3e2ac0 authorDavid Raymond Christiansen <david@davidchristiansen.dk> dateTue 2 Sep 2014, 08:55 (12 years ago) parent4dc73a012ff2e3
2 files changed+4−5
idris.cabal+1−1 src/Idris/CmdOptions.hs+3−4
idris.cabal+1−1
@@ -699,7 +699,7 @@ Library
699699 , xml
700700 , deepseq
701701 , zlib
702− , optparse-applicative >= 0.8
702+ , optparse-applicative >= 0.10
703703 Extensions: MultiParamTypeClasses
704704 , DeriveFoldable
705705 , DeriveTraversable
src/Idris/CmdOptions.hs+3−4
@@ -57,7 +57,7 @@ runArgParser = do opts <- execParser $ info parser
5757
5858
5959pureArgParser :: [String] -> [Opt]
60−pureArgParser args = case execParserMaybe (info parser idm) args of
60+pureArgParser args = case getParseResult $ execParserPure (prefs idm) (info parser idm) args of
6161 Just opts -> preProcOpts opts []
6262 Nothing -> []
6363
@@ -74,7 +74,7 @@ parseFlags = many $
7474 <|> flag' Ideslave (long "ideslave")
7575 <|> flag' IdeslaveSocket (long "ideslave-socket")
7676 <|> (Client <$> strOption (long "client"))
77− <|> (OLogging <$> option (long "log" <> metavar "LEVEL" <> help "Debugging log level"))
77+ <|> (OLogging <$> option auto (long "log" <> metavar "LEVEL" <> help "Debugging log level"))
7878 <|> flag' NoBasePkgs (long "nobasepkgs")
7979 <|> flag' NoPrelude (long "noprelude")
8080 <|> flag' NoBuiltins (long "nobuiltins")
@@ -120,7 +120,7 @@ parseFlags = many $
120120 <|> flag' (OptLevel 2) (long "O2")
121121 <|> flag' (OptLevel 1) (long "O1")
122122 <|> flag' (OptLevel 0) (long "O0")
123− <|> (OptLevel <$> option (short 'O' <> long "level"))
123+ <|> (OptLevel <$> option auto (short 'O' <> long "level"))
124124 <|> (TargetTriple <$> strOption (long "target" <> metavar "TRIPLE" <> help "Select target triple (for llvm codegen)"))
125125 <|> (TargetCPU <$> strOption (long "cpu" <> metavar "CPU" <> help "Select target CPU e.g. corei7 or cortex-m3 (for LLVM codegen)"))
126126 <|> flag' (ColourREPL True) (long "colour" <> long "color" <> help "Force coloured output")
@@ -144,4 +144,3 @@ preProcOpts (x:xs) ys = preProcOpts xs (x:ys)
144144parseCodegen :: String -> Codegen
145145parseCodegen "bytecode" = Bytecode
146146parseCodegen cg = Via (map toLower cg)
147−