ede 0.2.8.5 → 0.2.8.6

raw patch · 3 files changed

+12/−2 lines, 3 files

Files

ede.cabal +1/−1
src/Text/EDE.hs +1/−0
src/Text/EDE/Internal/Types.hs +10/−1

ede.cabal view

@@ -1,5 +1,5 @@ name:                  ede-version:               0.2.8.5+version:               0.2.8.6 synopsis:              Templating language with similar syntax and features to Liquid or Jinja2. homepage:              http://github.com/brendanhay/ede license:               OtherLicense

src/Text/EDE.hs view

@@ -34,6 +34,7 @@     -- ** Includes     -- $resolvers     , Resolver+    , Id     , includeMap     , includeFile

src/Text/EDE/Internal/Types.hs view

@@ -1,3 +1,4 @@+{-# LANGUAGE CPP               #-} {-# LANGUAGE DeriveFoldable    #-} {-# LANGUAGE DeriveFunctor     #-} {-# LANGUAGE DeriveTraversable #-}@@ -9,6 +10,10 @@ {-# LANGUAGE TemplateHaskell   #-} {-# LANGUAGE TupleSections     #-} +#if __GLASGOW_HASKELL__ < 710+{-# LANGUAGE OverlappingInstances #-}+#endif+ -- Module      : Text.EDE.Internal.Types -- Copyright   : (c) 2013-2015 Brendan Hay <brendan.g.hay@gmail.com> -- License     : This Source Code Form is subject to the terms of@@ -130,7 +135,11 @@ -- | A function to resolve the target of an @include@ expression. type Resolver m = Syntax -> Id -> Delta -> m (Result Template) -instance Applicative m => Semigroup (Resolver m) where+instance+#if __GLASGOW_HASKELL__ >= 710+  {-# OVERLAPPING #-}+#endif+  Applicative m => Semigroup (Resolver m) where     (f <> g) o k d = liftA2 (<|>) (f o k d) (g o k d) -- Haha!     {-# INLINE (<>) #-}