From 4dc7c9b2b700d43e6b8550b218b6c67bdf20f565 Mon Sep 17 00:00:00 2001 From: Johannes Gerer Date: Sun, 15 Jan 2017 13:58:31 +0100 Subject: added `textComment` --- .gitignore | 1 + blazeT.cabal | 2 +- src/Text/BlazeT/Internal.hs | 26 ++++++++++++++---- stack.yaml | 66 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 89 insertions(+), 6 deletions(-) create mode 100644 stack.yaml diff --git a/.gitignore b/.gitignore index da61294..9286fea 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ cabal.sandbox.config cabal.project.local report.html src/Benchmarks/RunHtmlBenchmarks +TAGS diff --git a/blazeT.cabal b/blazeT.cabal index 8bfd200..3ecb0f4 100644 --- a/blazeT.cabal +++ b/blazeT.cabal @@ -1,5 +1,5 @@ Name: blazeT -Version: 0.0.4 +Version: 0.0.5 Homepage: Bug-Reports: http://github.com/johannesgerer/blazeT/issues License: MIT diff --git a/src/Text/BlazeT/Internal.hs b/src/Text/BlazeT/Internal.hs index fcdf944..f6f642a 100644 --- a/src/Text/BlazeT/Internal.hs +++ b/src/Text/BlazeT/Internal.hs @@ -63,11 +63,11 @@ module Text.BlazeT.Internal , unsafeLazyByteString -- ** Comments - , Text.Blaze.textComment - , Text.Blaze.lazyTextComment - , Text.Blaze.stringComment - , Text.Blaze.unsafeByteStringComment - , Text.Blaze.unsafeLazyByteStringComment + , textComment + , lazyTextComment + , stringComment + , unsafeByteStringComment + , unsafeLazyByteStringComment -- ** Converting values to tags. , Text.Blaze.textTag @@ -273,6 +273,22 @@ lazyText :: LT.Text -> Markup lazyText = wrapMarkup . Text.Blaze.lazyText {-# INLINE lazyText #-} + +textComment :: T.Text -> Markup +textComment = wrapMarkup . Text.Blaze.textComment + +lazyTextComment :: LT.Text -> Markup +lazyTextComment = wrapMarkup . Text.Blaze.lazyTextComment + +stringComment :: String -> Markup +stringComment = wrapMarkup . Text.Blaze.stringComment + +unsafeByteStringComment :: BS.ByteString -> Markup +unsafeByteStringComment = wrapMarkup . Text.Blaze.unsafeByteStringComment + +unsafeLazyByteStringComment :: BL.ByteString -> Markup +unsafeLazyByteStringComment = wrapMarkup . Text.Blaze.unsafeLazyByteStringComment + -- $descr1 -- The following is an adaptation of all "Text.Blaze.Internal" exports to -- @blazeT@ types. diff --git a/stack.yaml b/stack.yaml new file mode 100644 index 0000000..397b67a --- /dev/null +++ b/stack.yaml @@ -0,0 +1,66 @@ +# This file was automatically generated by 'stack init' +# +# Some commonly used options have been documented as comments in this file. +# For advanced use and comprehensive documentation of the format, please see: +# http://docs.haskellstack.org/en/stable/yaml_configuration/ + +# Resolver to choose a 'specific' stackage snapshot or a compiler version. +# A snapshot resolver dictates the compiler version and the set of packages +# to be used for project dependencies. For example: +# +# resolver: lts-3.5 +# resolver: nightly-2015-09-21 +# resolver: ghc-7.10.2 +# resolver: ghcjs-0.1.0_ghc-7.10.2 +# resolver: +# name: custom-snapshot +# location: "./custom-snapshot.yaml" +resolver: lts-7.15 + +# User packages to be built. +# Various formats can be used as shown in the example below. +# +# packages: +# - some-directory +# - https://example.com/foo/bar/baz-0.0.2.tar.gz +# - location: +# git: https://github.com/commercialhaskell/stack.git +# commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a +# - location: https://github.com/commercialhaskell/stack/commit/e7b331f14bcffb8367cd58fbfc8b40ec7642100a +# extra-dep: true +# subdirs: +# - auto-update +# - wai +# +# A package marked 'extra-dep: true' will only be built if demanded by a +# non-dependency (i.e. a user package), and its test suites and benchmarks +# will not be run. This is useful for tweaking upstream packages. +packages: +- '.' +# Dependency packages to be pulled from upstream that are not in the resolver +# (e.g., acme-missiles-0.3) +extra-deps: [] + +# Override default flag values for local packages and extra-deps +flags: {} + +# Extra package databases containing global packages +extra-package-dbs: [] + +# Control whether we use the GHC we find on the path +# system-ghc: true +# +# Require a specific version of stack, using version ranges +# require-stack-version: -any # Default +# require-stack-version: ">=1.3" +# +# Override the architecture used by stack, especially useful on Windows +# arch: i386 +# arch: x86_64 +# +# Extra directories used by stack for building +# extra-include-dirs: [/path/to/dir] +# extra-lib-dirs: [/path/to/dir] +# +# Allow a newer minor version of GHC than the snapshot specifies +# compiler-check: newer-minor \ No newline at end of file -- cgit v1.2.3