Skip to content

Commit

Permalink
Fix examples build.
Browse files Browse the repository at this point in the history
  • Loading branch information
yihuang committed Aug 30, 2012
1 parent 366e4b1 commit dd548bf
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 14 deletions.
20 changes: 8 additions & 12 deletions Highlight.hs
Original file line number Diff line number Diff line change
@@ -1,21 +1,17 @@
import Data.Maybe
import System.IO
import System.Environment
import Text.HTML.TagStream
import System.Console.ANSI

import Data.Maybe
import Data.ByteString (ByteString)
import qualified Data.ByteString.Char8 as S
import System.Console.ANSI

import Data.Conduit.Blaze (builderToByteString)
import qualified Data.Conduit as C
import qualified Data.Conduit.Binary as CB
import qualified Data.Conduit.List as CL
import Blaze.ByteString.Builder (Builder)
import Data.Conduit.Blaze (builderToByteString)

encodeHL :: (ByteString -> ByteString) -> [Token] -> ByteString
encodeHL hl = B.toByteString . mconcat . map (showToken hl)

encode :: [Token] -> ByteString
encode = encodeHL id
import qualified Text.HTML.TagStream.ByteString as S

color :: Color -> ByteString -> ByteString
color c s = S.concat [ S.pack $ setSGRCode [SetColor Foreground Dull c]
Expand All @@ -29,7 +25,7 @@ main = do
filename <- maybe (fail "Highlight file") return (listToMaybe args)
C.runResourceT $
CB.sourceFile filename
C.$= tokenStream
C.$= CL.map (showToken (color Red))
C.$= S.tokenStream
C.$= CL.map (S.showToken (color Red))
C.$= builderToByteString
C.$$ CB.sinkHandle stdout
4 changes: 2 additions & 2 deletions Parse.hs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Data.Maybe
import System.Environment
import Text.HTML.TagStream
import qualified Text.HTML.TagStream.ByteString as S
import qualified Data.Conduit as C
import qualified Data.Conduit.Binary as C
import qualified Data.Conduit.List as CL
Expand All @@ -11,6 +11,6 @@ main = do
filename <- maybe (fail "pass file path") return (listToMaybe args)
_ <- C.runResourceT $
C.sourceFile filename
C.$= tokenStream
C.$= S.tokenStream
C.$$ CL.consume
return ()

0 comments on commit dd548bf

Please sign in to comment.