slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allow command-line options to be anywhere when negativepatternchar is something other than -

Browse Source
This commit is contained in:
Simon Michael 2008-10-15 17:06:40 +00:00
parent 5fcab59414
commit c404ae45d6
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Options.hs
View File

@ -3,12 +3,13 @@ where
import System import System
import System.Console.GetOpt import System.Console.GetOpt
import System.Directory import System.Directory
import Ledger.RawLedger (negativepatternchar)
usagehdr = "Usage: hledger [OPTIONS] "++commands++" [ACCTPATTERNS] [-- DESCPATTERNS]\nOptions:" usagehdr = "Usage: hledger [OPTIONS] "++commands++" [ACCTPATTERNS] [-- DESCPATTERNS]\nOptions:"
commands = "register|balance|print" commands = "register|balance|print"
defaultfile = "~/.ledger" defaultfile = "~/.ledger"
fileenvvar = "LEDGER" fileenvvar = "LEDGER"
optionorder = if negativepatternchar=='-' then RequireOrder else Permute
-- | Command-line options we accept. -- | Command-line options we accept.
options :: [OptDescr Opt] options :: [OptDescr Opt]
@ -40,7 +41,7 @@ version = "hledger version 0.1 alpha\n"
parseArguments :: IO ([Opt], String, [String]) parseArguments :: IO ([Opt], String, [String])
parseArguments = do parseArguments = do
args <- getArgs args <- getArgs
case (getOpt RequireOrder options args) of case (getOpt optionorder options args) of
(opts,cmd:args,[]) -> return (opts, cmd, args) (opts,cmd:args,[]) -> return (opts, cmd, args)
(opts,[],[]) -> return ([Help], [], []) (opts,[],[]) -> return ([Help], [], [])
(_,_,errs) -> ioError (userError (concat errs ++ usage)) (_,_,errs) -> ioError (userError (concat errs ++ usage))