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

;dev:cli: debug output tweaks; moveFlagsAfterCommand doc edit

Browse Source
This commit is contained in:
Simon Michael 2025-03-06 11:14:35 -10:00
parent 758335daf0
commit fd906bec95
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hledger/Hledger/Cli.hs
View File

@ -252,8 +252,8 @@ main = withGhcDebug' $ do
(clicmdarg, cliargswithoutcmd, cliargswithcmdfirst) = moveFlagsAfterCommand cliargs (clicmdarg, cliargswithoutcmd, cliargswithcmdfirst) = moveFlagsAfterCommand cliargs
cliargswithcmdfirstwithoutclispecific = dropCliSpecificOpts cliargswithcmdfirst cliargswithcmdfirstwithoutclispecific = dropCliSpecificOpts cliargswithcmdfirst
(cliargsbeforecmd, cliargsaftercmd) = second (drop 1) $ break (==clicmdarg) cliargs (cliargsbeforecmd, cliargsaftercmd) = second (drop 1) $ break (==clicmdarg) cliargs
dbgIO "cli args, with some preprocessing like doubling --" cliargs dbgIO "cli args with preprocessing" cliargs
dbg1IO "cli args with options moved after command, if any" cliargswithcmdfirst dbg1IO "cli args with preprocessing and options moved after command" cliargswithcmdfirst
dbgIO "cli command argument found" clicmdarg dbgIO "cli command argument found" clicmdarg
dbgIO "cli args before command" cliargsbeforecmd dbgIO "cli args before command" cliargsbeforecmd
dbgIO "cli args after command" cliargsaftercmd dbgIO "cli args after command" cliargsaftercmd
@ -501,10 +501,10 @@ cmdargsParse desc m args0 = process m (ensureDebugFlagHasVal args0)
-- We prefer to hide this restriction from the user, providing a more forgiving CLI. -- We prefer to hide this restriction from the user, providing a more forgiving CLI.
-- So this helper tries to move any pre-command flags/options, and their values if any, after the command argument. -- So this helper tries to move any pre-command flags/options, and their values if any, after the command argument.
-- If there is a "--"" argument, only the preceding args are rearranged. -- If there is a "--"" argument, only the preceding args are rearranged.
-- So to be precise: pre-command options will be moved to the end of the part of the command line preceding the first -- argument. -- To be precise: pre-command options will be moved to the end of the part of the command line preceding the first -- argument.
--
-- The pre-command options' relative order will be preserved, but since they may be moved after post-command options, -- The pre-command options' relative order will be preserved, but since they may be moved after post-command options,
-- the overall order of options may change. -- the overall order of options may change.
-- XXX moving them right after the command would probably be better.
-- --
-- For convenience of the caller, this currently returns a triple: -- For convenience of the caller, this currently returns a triple:
-- ( -- (