From a58c6d49d4b5d5cf750c36c9071279fccd9c468f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=C3=A4llberg?= Date: Sun, 2 Oct 2022 21:57:11 +0200 Subject: [PATCH] Extract the previous optimization to its own function --- src/compiler/GF/Grammar/Grammar.hs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/compiler/GF/Grammar/Grammar.hs b/src/compiler/GF/Grammar/Grammar.hs index 8b88561d2..448fa1657 100644 --- a/src/compiler/GF/Grammar/Grammar.hs +++ b/src/compiler/GF/Grammar/Grammar.hs @@ -129,9 +129,17 @@ isInherited :: MInclude -> Ident -> Bool isInherited c = case c of MIAll -> const True - MIOnly is -> let is' = Set.fromList is in (`Set.member` is') - MIExcept is -> let is' = Set.fromList is in (`Set.notMember` is') + MIOnly is -> elemOrd is + MIExcept is -> not . elemOrd is +-- | Faster version of `elem`, using a `Set`. +-- Make sure you give this the first argument _outside_ of the inner loop +-- +-- Example: +-- > myIntersection xs ys = filter (elemOrd xs) ys +elemOrd :: Ord a => [a] -> a -> Bool +elemOrd list = (`Set.member` set) + where set = Set.fromList list inheritAll :: ModuleName -> (ModuleName,MInclude) inheritAll i = (i,MIAll)