regexpr 0.3.1 → 0.3.2

raw patch · 4 files changed

+10/−2 lines, 4 files

Files

Hidden/ParseRegexStr.hs +7/−0
Hidden/SrcRegActList.hs +1/−1
Hidden/TestMain.hs +1/−0
regexpr.cabal +1/−1

Hidden/ParseRegexStr.hs view

@@ -64,6 +64,8 @@     ( isModeI >>= \ic ->        spot selfTest >>= return . Select . applyIf ic ignoreCase . (==) )     `mplus`+    parseBrace+    `mplus`     ( flip (ifM isModeM) mzero $ token '.' >> return (Select $ const True) )     `mplus`     ( token '\\' >> spot isSymbol >>= return . Select . (==) )@@ -146,3 +148,8 @@  concatMapParse :: MonadPlus m => (b -> m a) -> [b] -> m a concatMapParse f = foldr mplus mzero . map f++parseBrace :: RegexSrcParser RegexAction+parseBrace = do ret <- spot (flip elem "{}")+                still $ parseNot () $ spot isDigit+                return $ Select (==ret)

Hidden/SrcRegActList.hs view

@@ -19,7 +19,7 @@  selfTest :: Char -> Bool selfTest-  = flip elem "\b\n\f\r\t !\"#%&',-/:;<=>@]_'~{}" ||| isAlphaNum ||| isBit7On+  = flip elem "\b\n\f\r\t !\"#%&',-/:;<=>@]_'~" ||| isAlphaNum ||| isBit7On  plusesList :: [ (String, RegexAction -> RegexAction) ] plusesList = [

Hidden/TestMain.hs view

@@ -207,4 +207,5 @@  , "abcd"                               ~=? subRegexPR "[.]" "c" "ab.d"  , "abcdcfcg"                           ~=? gsubRegexPR "[.+$]" "c" "ab.d+f$g"  , Just ( ("", ("abc", "")), [] )       ~=? matchRegexPR "(?<=abc)" "abc"+ , Just ( ("{}", ("", "")), []  )       ~=? matchRegexPR "{}" "{}"  ]

regexpr.cabal view

@@ -1,5 +1,5 @@ Name:		regexpr-Version:	0.3.1+Version:	0.3.2 License:	LGPL License-File:	LICENSE Author:		Yoshikuni Jujo <PAF01143@nifty.ne.jp>