e650d1f · typeable/pandoc

git.iko.soy/typeable/pandoc

Error: Added PandocOptionError.

commite650d1fbfd2e2486dac939638bde5c0d325da8a9 authorJohn MacFarlane <jgm@berkeley.edu> dateTue 4 Apr 2017, 14:34 (10 years ago) parentf1eb3b3

2 files changed+3−1

unifiedsplit

src/Text/Pandoc/App.hs+1−1

@@ -97,7 +97,7 @@ parseOptions options' defaults = do

9797 let unknownOptionErrors = foldr handleUnrecognizedOption [] unrecognizedOpts

9898

9999 unless (null errors && null unknownOptionErrors) $

100− E.throwIO $ PandocAppError 2 $

100+ E.throwIO $ PandocOptionError $

101101 concat errors ++ unlines unknownOptionErrors ++

102102 ("Try " ++ prg ++ " --help for more information.")

103103

src/Text/Pandoc/Error.hs+2

@@ -51,6 +51,7 @@ data PandocError = PandocIOError String IOError

5151 | PandocParseError String

5252 | PandocParsecError Input ParseError

5353 | PandocMakePDFError String

54+ | PandocOptionError String

5455 | PandocAppError Int String

5556 deriving (Show, Typeable, Generic)

5657

@@ -77,6 +78,7 @@ handleError (Left e) =

7778 else ""

7879 in err 65 $ "\nError at " ++ show err' ++ errorInFile

7980 PandocMakePDFError s -> err 65 s

81+ PandocOptionError s -> err 2 s

8082 PandocAppError ec s -> err ec s

8183

8284err :: Int -> String -> IO a