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

Merge pull request #830 from ghallak/stop-reversing-args

Browse Source 
Stop reversing arguments in `moveFlagsAfterCommand`
This commit is contained in:
Simon Michael 2018-07-04 16:44:32 +01:00 committed by GitHub
commit e5b184b717
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
hledger/Hledger/Cli/Main.hs
View File

@ -225,16 +225,21 @@ moveFlagsAfterCommand args = moveArgs $ ensureDebugHasArg args
(bs,"--debug":[]) -> bs++"--debug=1":[]
_ -> as
-- -h ..., --version ...
moveArgs (f:a:as) | isMovableNoArgFlag f = (moveArgs $ a:as) ++ [f]
-- -f FILE ..., --alias ALIAS ...
moveArgs (f:v:a:as) | isMovableReqArgFlag f, isValue v = (moveArgs $ a:as) ++ [f,v]
-- -fFILE ..., --alias=ALIAS ...
moveArgs (fv:a:as) | isMovableReqArgFlagAndValue fv = (moveArgs $ a:as) ++ [fv]
-- -f(missing arg)
moveArgs (f:a:as) | isMovableReqArgFlag f, not (isValue a) = (moveArgs $ a:as) ++ [f]
-- anything else
moveArgs as = as
moveArgs args = insertFlagsAfterCommand $ moveArgs' (args, [])
where
-- -h ..., --version ...
moveArgs' ((f:a:as), flags) | isMovableNoArgFlag f = moveArgs' (a:as, flags ++ [f])
-- -f FILE ..., --alias ALIAS ...
moveArgs' ((f:v:a:as), flags) | isMovableReqArgFlag f, isValue v = moveArgs' (a:as, flags ++ [f,v])
-- -fFILE ..., --alias=ALIAS ...
moveArgs' ((fv:a:as), flags) | isMovableReqArgFlagAndValue fv = moveArgs' (a:as, flags ++ [fv])
-- -f(missing arg)
moveArgs' ((f:a:as), flags) | isMovableReqArgFlag f, not (isValue a) = moveArgs' (a:as, flags ++ [f])
-- anything else
moveArgs' (as, flags) = (as, flags)
insertFlagsAfterCommand ([], flags) = flags
insertFlagsAfterCommand (command:args, flags) = [command] ++ flags ++ args
isMovableNoArgFlag a = "-" `isPrefixOf` a && dropWhile (=='-') a `elem` noargflagstomove

2
tests/cli/a.j Normal file
View File

@ -0,0 +1,2 @@
2018/1/1 a1
(a) 1

2
tests/cli/b.j Normal file
View File

@ -0,0 +1,2 @@
2018/1/1 b1
(b) 1

8
tests/cli/multiple-files.test
View File

@ -58,3 +58,11 @@ hledger print -f personal.journal -f ../journal/a.timeclock -f ../journal/b.time
>>>2
>>>=0
# 4. same-date transactions in different files are shown in the right order
hledger -f a.j -f b.j reg
>>>
2018/01/01 a1 (a) 1 1
2018/01/01 b1 (b) 1 2
>>>2
>>>=0