Add module export lists.

Options/Applicative.hs

@@ -1,5 +1,16 @@
 {-# LANGUAGE Rank2Types, PatternGuards #-}
-module Options.Applicative where
+module Options.Applicative (
+  Parser,
+
+  ParserInfo(..),
+  info,
+
+  evalParser,
+  runParser,
+  liftOpt,
+  mapParser,
+  optionNames
+  ) where
 
 import Control.Applicative
 import Data.Lens.Common
@@ -7,16 +18,6 @@ import Data.Maybe
 import Data.Monoid
 import Options.Applicative.Types
 
-optNameStr :: OptName -> String
-optNameStr (OptLong name) = name
-optNameStr (OptShort n) = [n]
-
-isLong, isShort :: OptName -> Bool
-isLong (OptLong _ ) = True
-isLong _ = False
-isShort (OptShort _ ) = True
-isShort _ = False
-
 optionNames :: OptReader a -> [OptName]
 optionNames (OptReader names _) = names
 optionNames (FlagReader names _) = names

Options/Applicative/Builder.hs

@@ -1,5 +1,30 @@
 {-# LANGUAGE TemplateHaskell, ScopedTypeVariables #-}
-module Options.Applicative.Builder where
+module Options.Applicative.Builder (
+  -- * Readers
+  auto,
+  str,
+  disabled,
+  -- * Combinators
+  short,
+  long,
+  help,
+  value,
+  metavar,
+  reader,
+  hide,
+  multi,
+  command,
+  idm,
+  (&),
+  -- * Parsers
+  subparser,
+  argument,
+  arguments,
+  flag,
+  nullOption,
+  strOption,
+  option
+  ) where
 
 import Control.Applicative
 import Control.Category
@@ -21,10 +46,6 @@ data FlagFields a = FlagFields
 data CommandFields a = CommandFields
   { _cmdCommands :: [(String, ParserInfo a)] }
 
-data ArgFields a = ArgFields
-
-data CmdFields a = CmdFields
-
 $( makeLenses [ ''OptionFields
               , ''FlagFields
               , ''CommandFields ] )

Options/Applicative/Extra.hs

@@ -1,4 +1,8 @@
-module Options.Applicative.Extra where
+module Options.Applicative.Extra (
+  helper,
+  execParser,
+  usage
+  ) where
 
 import Options.Applicative
 import Options.Applicative.Types
@@ -18,16 +22,16 @@ helper = nullOption
        & hide )
 
 execParser :: ParserInfo a -> IO a
-execParser info = do
+execParser pinfo = do
   args <- getArgs
-  let p = infoParser info
+  let p = infoParser pinfo
   case runParser p args of
     Just (a, []) -> return a
     _ -> do
       prog <- getProgName
-      let info' = info
+      let pinfo' = pinfo
-            { infoHeader = vcat [infoHeader info, usage p prog] }
+            { infoHeader = vcat [infoHeader pinfo, usage p prog] }
-      hPutStr stderr $ parserHelpText info'
+      hPutStr stderr $ parserHelpText pinfo'
       exitWith (ExitFailure 1)
 
 usage :: Parser a -> String -> String

Options/Applicative/Help.hs

@@ -1,5 +1,11 @@
 {-# LANGUAGE PatternGuards #-}
-module Options.Applicative.Help where
+module Options.Applicative.Help (
+  optDesc,
+  cmdDesc,
+  shortDesc,
+  fullDesc,
+  parserHelpText,
+  ) where
 
 import Data.Lens.Common
 import Data.List

Options/Applicative/Types.hs

@@ -1,5 +1,20 @@
 {-# LANGUAGE GADTs, DeriveFunctor, TemplateHaskell #-}
-module Options.Applicative.Types where
+module Options.Applicative.Types (
+  ParserInfo(..),
+  info,
+  Option(..),
+  OptName(..),
+  OptReader(..),
+  Parser(..),
+  P(..),
+
+  optMain,
+  optDefault,
+  optShow,
+  optHelp,
+  optMetaVar,
+  optCont
+  ) where
 
 import Control.Applicative
 import Control.Monad

Options/Applicative/Utils.hs

@@ -1,4 +1,9 @@
-module Options.Applicative.Utils where
+module Options.Applicative.Utils (
+  (<+>),
+  vcat,
+  tabulate,
+  pad
+  ) where
 
 import Data.List
 

tests/hello.hs

@@ -1,5 +1,5 @@
 import Control.Applicative
-import Options.Applicative.Types
+import Options.Applicative
 import Options.Applicative.Builder
 import Options.Applicative.Extra
 

tests/modes.hs

@@ -1,5 +1,5 @@
 import Control.Applicative
-import Options.Applicative.Types
+import Options.Applicative
 import Options.Applicative.Builder
 import Options.Applicative.Extra