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

lib: sort the matched include files lexicographically

Browse Source 
Now the files are included in the same order as they would be
listed by 'ls'.
This commit is contained in:
Joseph Weston 2018-07-24 22:05:38 +02:00 committed by Simon Michael
parent e8c362e3e5
commit f2c1586238
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hledger-lib/Hledger/Read/JournalReader.hs
View File

@ -208,8 +208,9 @@ includedirectivep = do
fileglob <- case tryCompileWith compDefault{errorRecovery=False} filename of fileglob <- case tryCompileWith compDefault{errorRecovery=False} filename of
Right x -> pure x Right x -> pure x
Left e -> parseErrorAt parserpos $ "Invalid glob pattern: " ++ e Left e -> parseErrorAt parserpos $ "Invalid glob pattern: " ++ e
-- Get all matching files in the current working directory -- Get all matching files in the current working directory, sorting in
filepaths <- liftIO $ globDir1 fileglob curdir -- lexicographic order to simulate the output of 'ls'.
filepaths <- liftIO $ sort <$> globDir1 fileglob curdir
if (not . null) filepaths if (not . null) filepaths
then pure filepaths then pure filepaths
else parseErrorAt parserpos$ "No existing files match pattern: " ++ filename else parseErrorAt parserpos$ "No existing files match pattern: " ++ filename