Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Use DERIVE_JSON_VIA_TH in Text.Pandoc.Filter.

Browse source 
Previously AVOID_TEMPLATE_HASKELL was used (with the opposite
valence).  I assume this was a leftover from an earlier version.
This commit is contained in:
John MacFarlane 2018-11-05 15:06:14 -08:00
parent 6a5661da63
commit 8c61fe8d6a
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Text/Pandoc/Filter.hs
View file

@ -38,11 +38,11 @@ module Text.Pandoc.Filter
) where
import Prelude
#ifdef AVOID_TEMPLATE_HASKELL
#ifdef DERIVE_JSON_VIA_TH
import Data.Aeson.TH (deriveJSON, defaultOptions)
#else
import Data.Aeson (FromJSON (..), ToJSON (..),
defaultOptions, genericToEncoding)
#else
import Data.Aeson.TH (deriveJSON, defaultOptions)
#endif
import Data.Foldable (foldrM)
import GHC.Generics (Generic)
@ -76,10 +76,10 @@ expandFilterPath :: Filter -> PandocIO Filter
expandFilterPath (LuaFilter fp) = LuaFilter <$> Path.expandFilterPath fp
expandFilterPath (JSONFilter fp) = JSONFilter <$> Path.expandFilterPath fp
#ifdef AVOID_TEMPLATE_HASKELL
#ifdef DERIVE_JSON_VIA_TH
$(deriveJSON defaultOptions ''Filter)
#else
instance ToJSON Filter where
toEncoding = genericToEncoding defaultOptions
instance FromJSON Filter
#else
$(deriveJSON defaultOptions ''Filter)
#endif