aboutsummaryrefslogtreecommitdiff
path: root/tp-bbcode/src/Thermoprint
diff options
context:
space:
mode:
authorGregor Kleen <pngwjpgh@users.noreply.github.com>2016-07-17 19:21:56 +0200
committerGregor Kleen <pngwjpgh@users.noreply.github.com>2016-07-17 19:21:56 +0200
commit2b9ceaead3f3cd80e973cccecb9a3eebc51154f7 (patch)
treedf2378943480647606b6a06f62c0f4b8b2ab406d /tp-bbcode/src/Thermoprint
parentac4cf4a0a494eafe55364f816569c517684fdf32 (diff)
downloadthermoprint-2b9ceaead3f3cd80e973cccecb9a3eebc51154f7.tar
thermoprint-2b9ceaead3f3cd80e973cccecb9a3eebc51154f7.tar.gz
thermoprint-2b9ceaead3f3cd80e973cccecb9a3eebc51154f7.tar.bz2
thermoprint-2b9ceaead3f3cd80e973cccecb9a3eebc51154f7.tar.xz
thermoprint-2b9ceaead3f3cd80e973cccecb9a3eebc51154f7.zip
Fixes for GHC 8.0.1
Diffstat (limited to 'tp-bbcode/src/Thermoprint')
-rw-r--r--tp-bbcode/src/Thermoprint/Printout/BBCode.hs2
-rw-r--r--tp-bbcode/src/Thermoprint/Printout/BBCode/Inverse.hs6
2 files changed, 4 insertions, 4 deletions
diff --git a/tp-bbcode/src/Thermoprint/Printout/BBCode.hs b/tp-bbcode/src/Thermoprint/Printout/BBCode.hs
index cbe2618..dd5edb0 100644
--- a/tp-bbcode/src/Thermoprint/Printout/BBCode.hs
+++ b/tp-bbcode/src/Thermoprint/Printout/BBCode.hs
@@ -104,7 +104,7 @@ morph :: DomForest -> Either SemanticError Printout
104-- ^ Parse a list of paragraphs 104-- ^ Parse a list of paragraphs
105-- 105--
106-- Since we permit only cooked input via 'Raw' 'Paragraph' is identical to 'Block' 106-- Since we permit only cooked input via 'Raw' 'Paragraph' is identical to 'Block'
107morph = fmap Seq.fromList . mapM (\t -> Seq.singleton . Cooked <$> parse BlockCtx t) 107morph = fmap (Printout . Seq.fromList) . mapM (\t -> Paragraph . Seq.singleton . Cooked <$> parse BlockCtx t)
108 108
109parseDom :: DomTree -> ParseResult 109parseDom :: DomTree -> ParseResult
110-- ^ Invoke 'asLine' and 'asBlock' to parse a single 'DomTree' 110-- ^ Invoke 'asLine' and 'asBlock' to parse a single 'DomTree'
diff --git a/tp-bbcode/src/Thermoprint/Printout/BBCode/Inverse.hs b/tp-bbcode/src/Thermoprint/Printout/BBCode/Inverse.hs
index edd4c5a..8e15417 100644
--- a/tp-bbcode/src/Thermoprint/Printout/BBCode/Inverse.hs
+++ b/tp-bbcode/src/Thermoprint/Printout/BBCode/Inverse.hs
@@ -24,10 +24,10 @@ import Data.Monoid
24import Thermoprint.Printout 24import Thermoprint.Printout
25 25
26cobbcode :: Printout -> Either UnicodeException Text 26cobbcode :: Printout -> Either UnicodeException Text
27cobbcode (toList -> ps) = mconcat . intersperse "\n\n" <$> mapM handlePar ps 27cobbcode (toList . getParagraphs -> ps) = mconcat . intersperse "\n\n" <$> mapM handlePar ps
28 28
29handlePar :: Seq Chunk -> Either UnicodeException Text 29handlePar :: Paragraph -> Either UnicodeException Text
30handlePar (toList -> cs) = mconcat <$> mapM handleChunk cs 30handlePar (toList . getChunks -> cs) = mconcat <$> mapM handleChunk cs
31 31
32handleChunk :: Chunk -> Either UnicodeException Text 32handleChunk :: Chunk -> Either UnicodeException Text
33handleChunk (Cooked b) = Right $ handleBlock b 33handleChunk (Cooked b) = Right $ handleBlock b