ede 0.2.8 → 0.2.8.1
raw patch · 5 files changed
+28/−41 lines, 5 filesdep ~text
Dependency ranges changed: text
Files
- ede.cabal +2/−2
- src/Text/EDE.hs +4/−17
- src/Text/EDE/Internal/Filters.hs +9/−8
- src/Text/EDE/Internal/Quoting.hs +10/−10
- src/Text/EDE/Internal/Types.hs +3/−4
ede.cabal view
@@ -1,5 +1,5 @@ name: ede-version: 0.2.8+version: 0.2.8.1 synopsis: Templating language with similar syntax and features to Liquid or Jinja2. homepage: http://github.com/brendanhay/ede license: OtherLicense@@ -82,7 +82,7 @@ , parsers >= 0.12.1.1 , scientific >= 0.3.1 , semigroups >= 0.15- , text >= 1.2 && < 1.3+ , text >= 1.2 , text-format >= 0.3 , text-manipulate >= 0.1.2 , trifecta >= 1.5.1
src/Text/EDE.hs view
@@ -118,8 +118,9 @@ import Data.Foldable (foldrM) import Data.HashMap.Strict (HashMap) import qualified Data.HashMap.Strict as Map-import Data.List.NonEmpty (NonEmpty(..))-import Data.Monoid+import Data.List.NonEmpty (NonEmpty (..))+import Data.Monoid (mappend)+import Data.Semigroup import Data.Text (Text) import qualified Data.Text as Text import qualified Data.Text.Lazy as LText@@ -130,25 +131,11 @@ import System.FilePath import qualified Text.EDE.Internal.Eval as Eval import qualified Text.EDE.Internal.Parser as Parser-import Text.EDE.Internal.Quoting (Term)+import Text.EDE.Internal.Quoting (Term) import Text.EDE.Internal.Syntax import Text.EDE.Internal.Types import Text.PrettyPrint.ANSI.Leijen (string) import Text.Trifecta.Delta---- FIXME: add documentation for all stdlib filters---- FIXME: detect include/import loops--- FIXME: {%- tags to deliberately strip/trim whitespace--- FIXME: ... {% include %} inline adds a trailing newline--- FIXME: streaming io--- FIXME: add benchmarks--- FIXME: add capture--- FIXME: numerous 'try' calls were added during development, these should now be reduced.--- FIXME: add pretty printer formatted error messages to the evaluator---- FIXME: would like to use PHOAS in-place of Term if it can be annotated--- in a similar fashion such as comonad/cofree. -- | ED-E Version. version :: Version
src/Text/EDE/Internal/Filters.hs view
@@ -1,8 +1,8 @@-{-# LANGUAGE ExtendedDefaultRules #-}-{-# LANGUAGE FlexibleInstances #-}-{-# LANGUAGE LambdaCase #-}-{-# LANGUAGE OverloadedStrings #-}-{-# LANGUAGE TupleSections #-}+{-# LANGUAGE ExtendedDefaultRules #-}+{-# LANGUAGE FlexibleInstances #-}+{-# LANGUAGE LambdaCase #-}+{-# LANGUAGE OverloadedStrings #-}+{-# LANGUAGE TupleSections #-} {-# OPTIONS_GHC -fno-warn-type-defaults #-} @@ -19,12 +19,13 @@ module Text.EDE.Internal.Filters where import Control.Applicative-import Data.Aeson (Value(..), Array, Object, encode)+import Data.Aeson (Array, Object, Value (..),+ encode) import qualified Data.Char as Char import Data.HashMap.Strict (HashMap) import qualified Data.HashMap.Strict as Map import Data.Maybe-import Data.Monoid+import Data.Monoid ((<>)) import Data.Scientific (Scientific) import Data.Text (Text) import qualified Data.Text as Text@@ -35,7 +36,7 @@ import qualified Data.Vector as Vector import Text.EDE.Internal.Quoting import Text.EDE.Internal.Types-import Text.PrettyPrint.ANSI.Leijen (Pretty(..), (<+>))+import Text.PrettyPrint.ANSI.Leijen (Pretty (..), (<+>)) default (Integer)
src/Text/EDE/Internal/Quoting.hs view
@@ -1,10 +1,10 @@-{-# LANGUAGE DefaultSignatures #-}-{-# LANGUAGE ExtendedDefaultRules #-}-{-# LANGUAGE FlexibleInstances #-}-{-# LANGUAGE GADTs #-}-{-# LANGUAGE LambdaCase #-}-{-# LANGUAGE OverloadedStrings #-}-{-# LANGUAGE TupleSections #-}+{-# LANGUAGE DefaultSignatures #-}+{-# LANGUAGE ExtendedDefaultRules #-}+{-# LANGUAGE FlexibleInstances #-}+{-# LANGUAGE GADTs #-}+{-# LANGUAGE LambdaCase #-}+{-# LANGUAGE OverloadedStrings #-}+{-# LANGUAGE TupleSections #-} {-# OPTIONS_GHC -fno-warn-type-defaults #-} @@ -22,13 +22,13 @@ import Control.Applicative import Control.Monad+import Data.Aeson hiding (Result (..)) import qualified Data.Aeson as A-import Data.Aeson hiding (Result(..)) import Data.Bifunctor import qualified Data.ByteString.Char8 as BS import qualified Data.HashMap.Strict as Map import Data.List (sortBy)-import Data.Monoid+import Data.Monoid (mappend, (<>)) import Data.Ord (comparing) import Data.Scientific import Data.Text (Text)@@ -39,7 +39,7 @@ import Data.Text.Manipulate (toOrdinal) import qualified Data.Vector as Vector import Text.EDE.Internal.Types-import Text.PrettyPrint.ANSI.Leijen (Doc, Pretty(..), (<+>), (</>))+import Text.PrettyPrint.ANSI.Leijen (Doc, Pretty (..), (<+>), (</>)) import qualified Text.PrettyPrint.ANSI.Leijen as PP import Text.Trifecta.Delta import Text.Trifecta.Rendering
src/Text/EDE/Internal/Types.hs view
@@ -25,16 +25,15 @@ import Control.Comonad import Control.Comonad.Cofree import Control.Lens-import Data.Aeson.Types hiding (Result(..))+import Data.Aeson.Types hiding (Result (..)) import Data.Foldable import Data.HashMap.Strict (HashMap)-import Data.List.NonEmpty (NonEmpty(..))+import Data.List.NonEmpty (NonEmpty (..)) import qualified Data.List.NonEmpty as NonEmpty-import Data.Monoid hiding ((<>)) import Data.Semigroup import Data.Text (Text) import qualified Data.Text as Text-import Text.PrettyPrint.ANSI.Leijen (Pretty(..), Doc)+import Text.PrettyPrint.ANSI.Leijen (Doc, Pretty (..)) import qualified Text.PrettyPrint.ANSI.Leijen as PP import Text.Trifecta.Delta