rhi/filemanip
1
0
Fork 0
Code Issues Pull requests Releases Activity

Remove infinite loop on MatchGroup without common prefix.

Browse source 
In that case, the exact same MatchGroup would be fed to simplifyTerms again. Now, it is returned immediately, and only the rest of the terms are simplified.
This commit is contained in:
Erik Hesselink 2012-04-17 14:02:05 +02:00
parent 5e1c7899ac
commit c07090e251
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
System/FilePath/GlobPattern.hs
View file

@ -117,8 +117,9 @@ simplifyTerms (MatchClass True (SRange a@[_] []):as) =
simplifyTerms (MatchGroup []:as) = simplifyTerms as
simplifyTerms (MatchGroup gs:as) =
case commonPrefix gs of
(p,[]) -> simplifyTerms (MatchLiteral p : as)
(p,ss) -> simplifyTerms (MatchLiteral p : MatchGroup ss : as)
(p ,[]) -> simplifyTerms (MatchLiteral p : as)
("",ss) -> MatchGroup ss : simplifyTerms as
(p ,ss) -> simplifyTerms (MatchLiteral p : MatchGroup ss : as)
simplifyTerms (a:as) = a:simplifyTerms as
commonPrefix :: [String] -> (String, [String])