git.iko.soy/typeable/html-parse
on master help sign in
Fixup 0e90fe2f95dbdd28e968e0bcf4bf32b0943c6ec9
2e97d8aMatthias Fischmann
Text/HTML/Tree.hs+6−6
compare with master
unifiedsplit
@@ -5,11 +5,11 @@ module Text.HTML.Tree
5 ( -- * Class
5 ( -- * Class
6 IsToken(..)
6 IsToken(..)
7 -- * Parsing forests
7 -- * Parsing forests
8− , parseTokenForest
8+ , tokensToForest
9 , ParseTokenForestError(..), PStack(..)
9 , ParseTokenForestError(..), PStack(..)
10 -- * Rendering forests
10 -- * Rendering forests
11− , renderTokenForest
11+ , tokensFromForest
12− , renderTokenTree
12+ , tokensFromTree
13 ) where
13 ) where
14
14
15import Data.Monoid
15import Data.Monoid
@@ -29,8 +29,8 @@ instance IsToken Token where
29 fromToken = id
29 fromToken = id
30
30
31
31
32−parseTokenForest :: (IsToken token) => [token] -> Either (ParseTokenForestError token) (Forest token)
32+tokensToForest :: (IsToken token) => [token] -> Either (ParseTokenForestError token) (Forest token)
33−parseTokenForest = f (PStack [] [])
33+tokensToForest = f (PStack [] [])
34 where
34 where
35 f (PStack ss []) [] = Right (reverse ss)
35 f (PStack ss []) [] = Right (reverse ss)
36 f pstack [] = Left $ ParseTokenForestErrorBracketMismatch pstack Nothing
36 f pstack [] = Left $ ParseTokenForestErrorBracketMismatch pstack Nothing
@@ -69,7 +69,7 @@ pushFlatSibling :: t -> PStack t -> PStack t
69pushFlatSibling t (PStack ss ps) = PStack (Node t [] : ss) ps
69pushFlatSibling t (PStack ss ps) = PStack (Node t [] : ss) ps
70
70
71
71
72−renderTokenForest :: (IsToken t, Show t) => Forest t -> [t]
72+renderTokenForest :: (IsToken t) => Forest t -> [t]
73renderTokenForest = mconcat . fmap renderTokenTree
73renderTokenForest = mconcat . fmap renderTokenTree
74
74
75renderTokenTree :: (IsToken t) => Tree t -> [t]
75renderTokenTree :: (IsToken t) => Tree t -> [t]