remove TDFA build flag
This commit is contained in:
parent
dcfb038cd2
commit
ecec42bbb4
4 changed files with 4 additions and 35 deletions
|
@ -1,15 +1,10 @@
|
|||
{- file globbing
|
||||
-
|
||||
- This uses TDFA when available, with a fallback to regex-compat.
|
||||
- TDFA is less buggy in its support for non-unicode characters.
|
||||
-
|
||||
- Copyright 2014 Joey Hess <id@joeyh.name>
|
||||
-
|
||||
- License: BSD-2-clause
|
||||
-}
|
||||
|
||||
{-# LANGUAGE CPP #-}
|
||||
|
||||
module Utility.Glob (
|
||||
Glob,
|
||||
GlobCase(..),
|
||||
|
@ -19,13 +14,8 @@ module Utility.Glob (
|
|||
|
||||
import System.Path.WildMatch
|
||||
|
||||
#ifdef WITH_TDFA
|
||||
import "regex-tdfa" Text.Regex.TDFA
|
||||
import "regex-tdfa" Text.Regex.TDFA.String
|
||||
#else
|
||||
import Text.Regex
|
||||
import Data.Maybe
|
||||
#endif
|
||||
|
||||
newtype Glob = Glob Regex
|
||||
|
||||
|
@ -34,13 +24,9 @@ data GlobCase = CaseSensative | CaseInsensative
|
|||
{- Compiles a glob to a regex, that can be repeatedly used. -}
|
||||
compileGlob :: String -> GlobCase -> Glob
|
||||
compileGlob glob globcase = Glob $
|
||||
#ifdef WITH_TDFA
|
||||
case compile (defaultCompOpt {caseSensitive = casesentitive}) defaultExecOpt regex of
|
||||
Right r -> r
|
||||
Left _ -> error $ "failed to compile regex: " ++ regex
|
||||
#else
|
||||
mkRegexWithOpts regex casesentitive True
|
||||
#endif
|
||||
where
|
||||
regex = '^':wildToRegex glob
|
||||
casesentitive = case globcase of
|
||||
|
@ -49,10 +35,6 @@ compileGlob glob globcase = Glob $
|
|||
|
||||
matchGlob :: Glob -> String -> Bool
|
||||
matchGlob (Glob regex) val =
|
||||
#ifdef WITH_TDFA
|
||||
case execute regex val of
|
||||
Right (Just _) -> True
|
||||
_ -> False
|
||||
#else
|
||||
isJust $ matchRegex regex val
|
||||
#endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue