[Pkg-haskell-commits] [SCM] haskell-testpack branch, master, updated. debian/1.0.2-1-4-gb0d6b36

gwern0 gwern0 at gmail.com
Fri Apr 23 15:22:00 UTC 2010


The following commit has been merged in the master branch:
commit 9f30582c3dfa4e08ab448a199845c40a9bef1818
Author: gwern0 <gwern0 at gmail.com>
Date:   Fri Nov 30 10:51:06 2007 +0100

    -Wall police

diff --git a/src/System/Path/WildMatch.hs b/src/System/Path/WildMatch.hs
index 7e5e5c9..b29d7df 100644
--- a/src/System/Path/WildMatch.hs
+++ b/src/System/Path/WildMatch.hs
@@ -20,7 +20,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    Copyright  : Copyright (C) 2006 John Goerzen
    License    : GNU GPL, version 2 or above
 
-   Maintainer : John Goerzen <jgoerzen at complete.org> 
+   Maintainer : John Goerzen <jgoerzen at complete.org>
    Stability  : provisional
    Portability: portable
 
@@ -61,15 +61,13 @@ by this module.  That is, @*.txt@ will match @.test.txt at .
 
 module System.Path.WildMatch (-- * Wildcard matching
                                 wildCheckCase,
-                                wildToRegex
-                               )
-
-where
+                                wildToRegex)
+    where
 
 import Text.Regex
-import Data.String
+import Data.MissingHString
 
-{- | Convert a wildcard to an (uncompiled) regular expression. 
+{- | Convert a wildcard to an (uncompiled) regular expression.
 
 -}
 wildToRegex :: String -> String
@@ -88,7 +86,6 @@ wildCheckCase patt name =
       Just _ -> True
 
 -- This is SO MUCH CLEANER than the python implementation!
-
 convwild :: String -> String
 convwild [] = []
 convwild ('*':xs) = ".*" ++ convwild xs
@@ -102,3 +99,4 @@ convpat :: String -> String
 convpat ('\\':xs) = "\\\\" ++ convpat xs
 convpat (']':xs) = ']' : convwild xs
 convpat (x:xs) = x : convpat xs
+convpat [] = []

-- 
haskell-testpack



More information about the Pkg-haskell-commits mailing list