From ecbf074bf467a87cd4d16595bb26c1723f22a920 Mon Sep 17 00:00:00 2001 From: justin Date: Tue, 21 Feb 2023 13:12:52 +0000 Subject: [PATCH] Tweak orRegex --- src/Dodge/DisplayInventory.hs | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/Dodge/DisplayInventory.hs b/src/Dodge/DisplayInventory.hs index 5e0fb6446..8067d8cfd 100644 --- a/src/Dodge/DisplayInventory.hs +++ b/src/Dodge/DisplayInventory.hs @@ -68,18 +68,6 @@ updateCombineInventory w cfig sss = mstr = w ^? hud . hudElement . subInventory . ciSections . sssExtra . sssFilters . ix (-1) . _Just numfiltitems = " " ++ show (length allcombs - length filtcombs) ++ " FILTERED" -regexCombs :: IM.IntMap (SelectionItem ()) -> String - -> IM.IntMap (SelectionItem CombinableItem) - -> IM.IntMap (SelectionItem CombinableItem) -regexCombs inv str = case str of - '<':str' -> IM.filter (f str') - _ -> IM.filter (regexList str . _siPictures) - where - f str' si = any (g str') (_ciInvIDs $ _siPayload si) - g str' i = fromMaybe False $ do - si' <- inv ^? ix i - return $ regexList str' $ _siPictures si' - regexCombs' :: IM.IntMap (SelectionItem ()) -> SelectionItem CombinableItem -> String -> Bool regexCombs' inv ci str = case str of '<':str' -> f str' ci @@ -94,6 +82,7 @@ andOrRegex :: (a -> String -> Bool) -> a -> String -> Bool andOrRegex f x str = all (orRegex f x) (wordsBy '&' str) orRegex :: (a -> String -> Bool) -> a -> String -> Bool +orRegex _ _ [] = True orRegex f x str = any (f x) (words str)