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

don't give a confusing error with -f and no command

Browse Source
This commit is contained in:
Simon Michael 2011-09-11 21:35:06 +00:00
parent 8a50cb1289
commit b46ffbac14
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hledger/Hledger/Cli/Options.hs
View File

@ -53,6 +53,7 @@ mainmode addons = defmode {
,modeGroupFlags = Group { ,modeGroupFlags = Group {
groupUnnamed = helpflags groupUnnamed = helpflags
,groupHidden = [flagNone ["binary-filename"] (setboolopt "binary-filename") "show the download filename for this executable, and exit"] ,groupHidden = [flagNone ["binary-filename"] (setboolopt "binary-filename") "show the download filename for this executable, and exit"]
++ fileflags -- quietly permit these flags before COMMAND as well
,groupNamed = [] ,groupNamed = []
} }
,modeArgs = ([], Just mainargsflag) ,modeArgs = ([], Just mainargsflag)
@ -136,14 +137,8 @@ helpflags = [
,flagVersion (setboolopt "version") ,flagVersion (setboolopt "version")
] ]
mainargsflag = flagArg f "" mainargsflag = flagArg (\s opts -> Right $ setopt "args" s opts) ""
where f s opts = let as = words' s
cmd = headDef "" as
args = drop (length cmd + 1) s
in Right $ setopt "command" cmd $ setopt "args" args opts
commandargsflag = flagArg (\s opts -> Right $ setopt "args" s opts) "[PATTERNS]" commandargsflag = flagArg (\s opts -> Right $ setopt "args" s opts) "[PATTERNS]"
addonargsflag = flagArg (\s opts -> Right $ setopt "args" s opts) "[ARGS]" addonargsflag = flagArg (\s opts -> Right $ setopt "args" s opts) "[ARGS]"
commandmode names = defmode {modeNames=names, modeValue=[("command",headDef "" names)]} commandmode names = defmode {modeNames=names, modeValue=[("command",headDef "" names)]}