lib: Minor refactor.

hledger-lib/Hledger/Query.hs

@@ -509,8 +509,7 @@ latestMaybeDate' = maximumByDef Nothing compareNothingMax
 
 -- | The depth limit this query specifies, or a large number if none.
 queryDepth :: Query -> Int
-queryDepth q = case queryDepth' q of [] -> 99999
+queryDepth = minimumDef maxBound . queryDepth'
-                                     ds -> minimum ds
   where
     queryDepth' (Depth d) = [d]
     queryDepth' (Or qs) = concatMap queryDepth' qs

hledger-lib/Hledger/Reports/ReportOptions.hs

@@ -442,33 +442,27 @@ journalSelectingAmountFromOpts opts =
 
 -- | Convert report options and arguments to a query.
 queryFromOpts :: Day -> ReportOpts -> Query
-queryFromOpts d ReportOpts{..} = simplifyQuery $ And $ [flagsq, argsq]
+queryFromOpts d ropts = simplifyQuery . And $ [flagsq, argsq]
   where
-    flagsq = And $
+    flagsq = queryFromOptsOnly d ropts
-              [(if date2_ then Date2 else Date) $ periodAsDateSpan period_]
+    argsq = fst $ parseQuery d (T.pack $ query_ ropts)
-              ++ (if real_ then [Real True] else [])
-              ++ (if empty_ then [Empty True] else []) -- ?
-              ++ [Or $ map StatusQ statuses_]
-              ++ (maybe [] ((:[]) . Depth) depth_)
-    argsq = fst $ parseQuery d (T.pack query_)
 
 -- | Convert report options to a query, ignoring any non-flag command line arguments.
 queryFromOptsOnly :: Day -> ReportOpts -> Query
-queryFromOptsOnly _d ReportOpts{..} = simplifyQuery flagsq
+queryFromOptsOnly _d ReportOpts{..} = simplifyQuery $ And flagsq
   where
-    flagsq = And $
+    flagsq = consIf   Real  real_
-              [(if date2_ then Date2 else Date) $ periodAsDateSpan period_]
+           . consIf   Empty empty_
-              ++ (if real_ then [Real True] else [])
+           . consJust Depth depth_
-              ++ (if empty_ then [Empty True] else []) -- ?
+           $   [ (if date2_ then Date2 else Date) $ periodAsDateSpan period_
-              ++ [Or $ map StatusQ statuses_]
+               , Or $ map StatusQ statuses_
-              ++ (maybe [] ((:[]) . Depth) depth_)
+               ]
+    consIf f b = if b then (f True:) else id
+    consJust f = maybe id ((:) . f)
 
 -- | Convert report options and arguments to query options.
 queryOptsFromOpts :: Day -> ReportOpts -> [QueryOpt]
-queryOptsFromOpts d ReportOpts{..} = flagsqopts ++ argsqopts
+queryOptsFromOpts d = snd . parseQuery d . T.pack . query_
-  where
-    flagsqopts = []
-    argsqopts = snd $ parseQuery d (T.pack query_)
 
 -- Report dates.