https-everywhere-else
/
https-everywhere-rules
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Simplified replacement parsing for less redundancy.

master
vi 2014-08-10 23:35:12 +08:00
parent 85a367ec94
commit 2c0a18a6f0
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Data/Text/ICU/Extras.hs
View File

@ -8,13 +8,13 @@ module Data.Text.ICU.Extras (
findAndReplace
) where
import Control.Applicative ((<$>), (*>), (<*>), (<|>))
import Control.Applicative ((<$>), (*>), (<|>))
import Control.Monad ((<=<))
import Control.Error (hush)
import Data.Attoparsec.Text (Parser, char, digit, takeWhile1, string, many', parseOnly)
import Data.Functor.Infix ((<$$>), (<&>))
import Data.Maybe (isJust, fromJust)
import Data.Monoid (Monoid(mappend,mconcat))
import Data.Monoid (Monoid(mconcat))
import Data.Text (Text)
import Data.Text.ICU (regex', find, group, Match)
@ -37,11 +37,11 @@ parseReference = char '$' *> digit <&> Reference . read . return
parseLiteral :: Parser Segment
parseLiteral = Literal <$> takeWhile1 (/= '$')
parseLiteralWithPrecedingDollar :: Parser Segment
parseLiteralWithPrecedingDollar = Literal <$$> mappend <$> string "$" <*> takeWhile1 (/= '$')
parseLiteralDollar :: Parser Segment
parseLiteralDollar = Literal <$> string "$"
parseSegment :: Parser Segment
parseSegment = parseLiteral <|> parseReference <|> parseLiteralWithPrecedingDollar
parseSegment = parseLiteral <|> parseReference <|> parseLiteralDollar
parseReplacement :: Text -> Maybe Replacement
parseReplacement = hush . parseOnly (many' parseSegment)