uu-parsinglib 2.5.4 → 2.5.4.1

raw patch · 4 files changed

+46/−24 lines, 4 filesPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

API changes (from Hackage documentation)

Files

• src/Text/ParserCombinators/UU/CHANGELOG.hs +16/−0
• src/Text/ParserCombinators/UU/Derived.hs +27/−23
• src/Text/ParserCombinators/UU/Examples.hs +2/−0
• uu-parsinglib.cabal +1/−1

@@ -1,5 +1,21 @@ -- | This module just contains the CHANGELOG --+-- Version 2.5.4.1+--+--      * added a @pSem@ which makes it possible to tell how certain components of merged structures are to be combined before exposing all elements to the outer sem: +--+-- >  run ( (,)  `pMerge` ( ((++) `pSem` (pMany pa <||> pMany pb)) <||> pOne pc))  "abcaaab"+-- >+-- >  Result: (["a","a","a","a","b","b"],"c")+--+--      * added a @pMergedSep@, which allows you to specify a separator between two merged elements+--+-- >  run ((((,), pc) `pMergeSep` (pMany pa <||> pMany pb))) "acbcacbc"+-- >+-- > Result: (["a","a","a"],["b","b"])+-- > Correcting steps: +-- >    Inserted 'a' at position (0,8) expecting one of ['b', 'a']+-- -- Version 2.5.4 -- --      * made the merging combinators more general introducing  @pAtMost@, @pBetween@ and  @pAtLeast@; examples are extended; see @`demo_merge`@

@@ -157,7 +157,6 @@               | Many            p               | Opt             p               | Never           p-                instance Functor Freq where    fmap f (AtLeast n     p)    = AtLeast n   (f p)@@ -176,30 +175,31 @@ canBeEmpty (Opt          p)  = True canBeEmpty (Never        p)  = True -oneAlt  (AtLeast 1   p, others)   = (p, toTree (Many                p : others))-oneAlt  (AtLeast n   p, others)   = (p, toTree (AtLeast  (n-1)      p : others))-oneAlt  (AtMost  1   p, others)   = (p, toTree                          others )-oneAlt  (AtMost  n   p, others)   = (p, toTree (AtMost   (n-1)      p : others))-oneAlt  (Between 1 1 p, others)   = (p, toTree                          others )-oneAlt  (Between 1 m p, others)   = (p, toTree (AtMost        (m-1) p : others))-oneAlt  (Between n m p, others)   = (p, toTree (Between (n-1) (m-1) p : others))-oneAlt  (One         p, others)   = (p, toTree                          others )-oneAlt  (Many        p, others)   = (p, toTree (Many                p : others))-oneAlt  (Opt         p, others)   = (p, toTree                          others )--data Tree p = Br [(p, Tree p)] Bool---- this code can be optimised in order to avoid repeated analyses; to be done later----toTree :: [Freq p] -> Tree p-toTree  alts = Br (map oneAlt (split alts id)) (and (map canBeEmpty alts) )+split :: [Freq p] -> ([Freq p] -> [Freq p]) -> [(p, [Freq p])] split []     _ = []-split (x:xs) f = (x, f xs): split xs (f.(x:))+split (x:xs) f = oneAlt (x, f xs): split xs (f.(x:))+                 where oneAlt  (AtLeast 1   p, others)   = (p, Many                p : others)+                       oneAlt  (AtLeast n   p, others)   = (p, AtLeast  (n-1)      p : others)+                       oneAlt  (AtMost  1   p, others)   = (p,                         others)+                       oneAlt  (AtMost  n   p, others)   = (p, AtMost   (n-1)      p : others)+                       oneAlt  (Between 1 1 p, others)   = (p,                         others)+                       oneAlt  (Between 1 m p, others)   = (p, AtMost        (m-1) p : others)+                       oneAlt  (Between n m p, others)   = (p, Between (n-1) (m-1) p : others)+                       oneAlt  (One         p, others)   = (p,                         others)+                       oneAlt  (Many        p, others)   = (p, Many                p : others)+                       oneAlt  (Opt         p, others)   = (p,                         others) -toParser :: Tree (P st (d -> d)) -> d -> P st d-toParser (Br alts b)  units = foldr (<|>) (if b then pure units else empty)  -                              [p <*> toParser ps units | (p,ps) <- alts]+toParser :: [ Freq (P st (d -> d)) ] -> P st d -> P st d+toParser []    units  =  units+toParser alts  units  =  let palts = [p <*> toParser  ps units | (p,ps) <- split alts id]+                         in if and (map canBeEmpty alts) +                            then foldr (<|>) units palts+                            else foldr1 (<|>) palts +toParserSep alts sep  units  =  let palts = [p <*> toParser  (map (fmap (sep *>)) ps) units | (p,ps) <- split alts id]+                                in if   and (map canBeEmpty alts) +                                   then foldr  (<|>) units palts+                                   else foldr1 (<|>) palts  newtype MergeSpec p = MergeSpec p @@ -212,9 +212,13 @@              , map (fmap (mapFst <$>)) pp ++  map (fmap (mapSnd <$>)) qp              , \f (x, y) -> qunp (punp f x) y              )+f `pSem` MergeSpec (units, alts, unp) = MergeSpec  (units, alts, \ g arg -> g ( unp f arg))  pMerge ::  c -> MergeSpec (d, [Freq (P st (d -> d))], c -> d -> e) -> P st e-sem `pMerge` MergeSpec (units, alts, unp) =  unp sem <$> toParser (toTree alts) units+sem `pMerge` MergeSpec (units, alts, unp) =  unp sem <$> toParser alts (pure units)++pMergeSep ::  (c, P st a)  -> MergeSpec (d, [Freq (P st (d -> d))], c -> d -> e) -> P st e+(sem, sep) `pMergeSep` MergeSpec (units, alts, unp) =  unp sem <$> toParserSep alts sep (pure units)  pBetween  n m p = must_be_non_empty "pOpt"  p                   (if m <n || m <= 0 then         (MergeSpec ([]       ,[                           ], id)) 

@@ -369,6 +369,8 @@                 DEMO (((,)   `pMerge` (pSome pb <||> pMany pc))                                     , "bcbc")                 DEMO (((,,,) `pMerge` (pSome pa <||> pMany pb <||> pOne pc <||>  pNatural `pOpt` 5)), "babc45" )                 DEMO (((,)   `pMerge` (pMany (pa <|> pb) <||> pSome pNatural))                      , "1ab12aab14")+                DEMO (( (,)  `pMerge` ( ((++) `pSem` (pMany pa <||> pMany pb)) <||> pOne pc))       , "abcaaab")+                DEMO (((((,), pc) `pMergeSep` (pMany pa <||> pMany pb)))                              , "acbcacb")   demo :: Show r => String -> String -> Parser r -> IO ()

@@ -1,5 +1,5 @@ Name:                uu-parsinglib-Version:             2.5.4+Version:             2.5.4.1 Build-Type:          Simple License:             MIT Copyright:           S Doaitse Swierstra