summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/compiler/GF/Grammar/Grammar.hs12
1 files 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)