regexpr 0.2.2 → 0.2.3

raw patch · 7 files changed

+37/−28 lines, 7 files

Files

Hidden/ParseLib.hs +7/−6
Hidden/ParseRegexStr.hs +2/−1
Hidden/RegexPRTypes.hs +1/−0
Hidden/TestMain.hs +1/−0
TODO +0/−19
TODO.ja.utf-8 +19/−0
regexpr.cabal +7/−2

Hidden/ParseLib.hs view

@@ -47,15 +47,16 @@ repeatParse, greedyRepeatParse ::   MonadPlus m => Int -> Maybe Int -> m b -> m [b] repeatParse mn (Just mx) p-  | mn == mx = replicateM mn p-  | mn <  mx = replicateM mn p `mplus`-                 (p >:> repeatParse mn (Just $ mx - 1) p)+  | mn == mx  = replicateM mn p+  | mn <  mx  = replicateM mn p `mplus` (p >:> repeatParse mn (Just $ mx - 1) p)+  | otherwise = error "minimal larger than maximal" repeatParse mn Nothing p   = replicateM mn p `mplus` (p >:> repeatParse mn Nothing p) greedyRepeatParse mn (Just mx) p-  | mn == mx = replicateM mn p-  | mn <  mx = (p >:> greedyRepeatParse mn (Just $ mx - 1) p) `mplus`-                 replicateM mn p+  | mn == mx  = replicateM mn p+  | mn <  mx  = (p >:> greedyRepeatParse mn (Just $ mx - 1) p) `mplus`+                  replicateM mn p+  | otherwise = error "minimal larger than maximal" greedyRepeatParse mn Nothing p   = (p >:> greedyRepeatParse mn Nothing p) `mplus` replicateM mn p

Hidden/ParseRegexStr.hs view

@@ -108,7 +108,8 @@  parseTokenX :: RegexSrcParser RegexAction parseTokenX = ( spot isSpace >> return NopRegex ) `mplus`-	      ( token '#' >> list (spot (/='\n')) >>= skipRet (token '\n') >>=+	      ( token '#' >> list (spot (/='\n')) >>=+	        skipRet (token '\n' `mplus` endOfInput '\n') >>= 	        return . Comment )  parsePluses ::

Hidden/RegexPRTypes.hs view

@@ -48,6 +48,7 @@ setMode 'i' = modify . modifySnd . modifyFirst  . const setMode 'm' = modify . modifySnd . modifySecond . const setMode 'x' = modify . modifySnd . modifyThird  . const+setMode m   = error $ "no " ++ [m] ++ " mode"  isModeI, isModeM, isModeX :: RegexSrcParser Bool isModeI = gets $ first  . snd

Hidden/TestMain.hs view

@@ -159,4 +159,5 @@  , Just ( ("\227\129\130", ("", "")), [] )                                         ~=?      matchRegexPR "\227\129\130" "\227\129\130"+ , "abc!abc!abc!bc"                ~=? gsubRegexPR "(?ixm) aBc   . # comment   " "abc!" "abc\nABCDAbcAbc"  ]

− TODO

@@ -1,19 +0,0 @@-2008.1.12 Sat.-(?> )-(?ixm-ixm)-(?ixm-ixm: )-日本語(UTF-8)対応--2008.1.17 Thr.-(?<! )--(?ixm-ixm)-(?ixm-ixm: )-の2者は実装済み。--TODO LIST-(?<! )-\w\W\s\S\d\D in char class([ .. ])-\08とかについて-(?> )-日本語(UTF-8)対応。

+ TODO.ja.utf-8 view

@@ -0,0 +1,19 @@+2008.1.12 Sat.+(?> )+(?ixm-ixm)+(?ixm-ixm: )+日本語(UTF-8)対応++2008.1.17 Thr.+(?<! )++(?ixm-ixm)+(?ixm-ixm: )+の2者は実装済み。++TODO LIST+(?<! )+\w\W\s\S\d\D in char class([ .. ])+\08とかについて+(?> )+日本語(UTF-8)対応。

regexpr.cabal view

@@ -1,5 +1,5 @@ Name:		regexpr-Version:	0.2.2+Version:	0.2.3 License:	GPL License-File:	LICENSE Author:		Yoshikuni Jujo <PAF01143@nifty.ne.jp>@@ -23,6 +23,11 @@                Just (("abc",("kkkabchij","de")),[])   .   gsubRegexPR "\\G(\\d\\d\\d)" "\\1," "123456 789" => "123,456, 789"+  .+  subRegexPR "(?<=(.)(.)(.))e" " \\3\\2\\1 " "abcdefg" => "abcd dcb fg"+  .+  gsubRegexPR "(?ixm)  aBc  . # comment \n\n" "abc!" "abc\nABCDAbcAbc" =>+               "abc!abc!abc!bc" Category:	Text Build-Depends:	base, mtl, HUnit Build-Type:     Simple@@ -31,5 +36,5 @@ 		Hidden.ParseLibCore, Hidden.RegexPRCore, 		Hidden.ParseRegexStr, Hidden.SrcRegActList, 		Hidden.TestMain-Extra-source-files: TODO, localConfigure+Extra-source-files: TODO.ja.utf-8, localConfigure ghc-options:    -Wall -O2 -optl-Wl,-s