git.iko.soy/typeable/pandoc
on master help sign in
Revert "Text.Pandoc.Data: ensure it compiles even without embed_data_files."

This reverts commit 453970c6b34ed7cc2f52181e5e77b9182a3639e9.

commitb7782cf8d32d22d8e9bc8bc125be2b2ff1fdd751 authorJohn MacFarlane <jgm@berkeley.edu> dateSun 26 Mar 2017, 20:41 (10 years ago) parent358dfba
1 file changed+3−11
src/Text/Pandoc/Data.hs+3−11
src/Text/Pandoc/Data.hs+3−11
@@ -1,15 +1,11 @@
1−{-# LANGUAGE CPP #-}
2−#ifdef EMBED_DATA_FILES
31{-# LANGUAGE TemplateHaskell #-}
4−#endif
2+
53module Text.Pandoc.Data (dataFiles) where
64
7−import System.FilePath (FilePath, splitDirectories)
5+import Data.FileEmbed
86import qualified Data.ByteString as B
7+import System.FilePath (splitDirectories)
98import qualified System.FilePath.Posix as Posix
10−#ifdef EMBED_DATA_FILES
11−import Data.FileEmbed
12−#endif
139
1410-- We ensure that the data files are stored using Posix
1511-- path separators (/), even on Windows.
@@ -18,8 +14,4 @@ dataFiles = map (\(fp, contents) ->
1814 (Posix.joinPath (splitDirectories fp), contents)) dataFiles'
1915
2016dataFiles' :: [(FilePath, B.ByteString)]
21−#ifdef EMBED_DATA_FILES
2217dataFiles' = ("MANUAL.txt", $(embedFile "MANUAL.txt")) : $(embedDir "data")
23−#else
24−dataFiles' = error "dataFiles is only defined when embed_data_files flag set"
25−#endif