git.iko.soy/typeable/html-parse
on master help sign in
Rename tree constructor and analyser.
commitf7b110f069457aca0a185b2cf7a114ab74313320 authorMatthias Fischmann <mf@zerobuzz.net> dateSun 1 Jan 2017, 02:16 (10 years ago) parent2e97d8a
2 files changed+8−8
Text/HTML/Tree.hs+7−7 tests/Text/HTML/TreeSpec.hs+1−1
Text/HTML/Tree.hs+7−7
@@ -69,13 +69,13 @@ pushFlatSibling :: t -> PStack t -> PStack t
6969pushFlatSibling t (PStack ss ps) = PStack (Node t [] : ss) ps
7070
7171
72−renderTokenForest :: (IsToken t) => Forest t -> [t]
73−renderTokenForest = mconcat . fmap renderTokenTree
72+tokensFromForest :: (IsToken t) => Forest t -> [t]
73+tokensFromForest = mconcat . fmap tokensFromTree
7474
75−renderTokenTree :: (IsToken t) => Tree t -> [t]
76−renderTokenTree (Node o@(toToken -> Just (TagOpen n _)) ts)
77− = [o] <> renderTokenForest ts <> [fromToken $ TagClose n]
78−renderTokenTree (Node t []) =
75+tokensFromTree :: (IsToken t) => Tree t -> [t]
76+tokensFromTree (Node o@(toToken -> Just (TagOpen n _)) ts)
77+ = [o] <> tokensFromForest ts <> [fromToken $ TagClose n]
78+tokensFromTree (Node t [])
7979 = [t]
80−renderTokenTree _
80+tokensFromTree _
8181 = error "renderTokenTree: leaf node with children."
tests/Text/HTML/TreeSpec.hs+1−1
@@ -32,4 +32,4 @@ spec :: Spec
3232spec = do
3333 it "parseTokenForests and renderTokenForest are inverses"
3434 . property . forAllShrink arbitraryTokenForest shrinkTokenForest $
35− \forest -> parseTokenForest (renderTokenForest forest) `shouldBe` Right forest
35+ \forest -> tokensToForest (tokensFromForest forest) `shouldBe` Right forest