regexpr 0.3.2 → 0.3.3

raw patch · 3 files changed

+13/−7 lines, 3 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• Hidden/ParseRegexStr.hs +11/−6
• Hidden/TestMain.hs +1/−0
• regexpr.cabal +1/−1

@@ -14,7 +14,7 @@ 			     setMode, setModes, getModes, 			     isModeI, isModeM, isModeX ) import Text.ParserCombinators.MTLParse-                           ( runParse, spot, token, tokens, mzero, mplus,+                           ( runParse, spot, spotBack, token, tokens, mzero, mplus,                              still, parseNot, endOfInput, MonadParse, 			     MonadPlus,                              list, greedyNeList, optional )@@ -64,7 +64,7 @@     ( isModeI >>= \ic ->        spot selfTest >>= return . Select . applyIf ic ignoreCase . (==) )     `mplus`-    parseBrace+    parseOpenBrace `mplus` parseCloseBrace     `mplus`     ( flip (ifM isModeM) mzero $ token '.' >> return (Select $ const True) )     `mplus`@@ -149,7 +149,12 @@ 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)+parseOpenBrace :: RegexSrcParser RegexAction+parseOpenBrace = do ret <- token '{'+                    still $ parseNot () $ spot isDigit+                    return $ Select (==ret)++parseCloseBrace :: RegexSrcParser RegexAction+parseCloseBrace = do still $ parseNot () $ spotBack isDigit+                     ret <- token '}'+		     return $ Select (==ret)

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

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