Merge pull request #24 from packetloop/add-deepseq-support-use-hpack

Add deepseq support to XmlCursor.  Use hpack.

Author: newhoggy

.gitignore

@@ -14,6 +14,7 @@ cabal.sandbox.config
 *.prof
 *.aux
 *.hp
+*.cabal
 
 /*.submodules
 /.stack-work/

circle.yml

@@ -3,7 +3,7 @@ jobs:
   build:
     working_directory: ~/hw-xml
     docker:
-      - image: fpco/stack-build:latest
+      - image: quay.io/haskell_works/stack-build-cabal
 
     steps:
       - checkout
@@ -49,7 +49,7 @@ jobs:
       ##### Building library
       - restore_cache:
           keys:
-            - dot-stack-{{ checksum "stack.yaml" }}-{{ checksum "hw-xml.cabal" }}
+            - dot-stack-{{ checksum "stack.yaml" }}-{{ checksum "package.yaml" }}
             - dot-stack-{{ checksum "stack.yaml" }}-build
             - dot-stack-{{ checksum "stack.yaml" }}-setup
 
@@ -74,7 +74,7 @@ jobs:
           command: stack --stack-yaml stack-ci.yaml build --test --no-run-tests
 
       - save_cache:
-          key: dot-stack-{{ checksum "stack.yaml" }}-{{ checksum "hw-xml.cabal" }}
+          key: dot-stack-{{ checksum "stack.yaml" }}-{{ checksum "package.yaml" }}
           paths:
             - ~/.stack
       - save_cache:

hw-xml.cabal

@@ -0,0 +1,133 @@
+name: hw-xml
+version: '0.1.0.1'
+synopsis: Conduits for tokenizing streams.
+description: Please see README.md
+category: Data, XML
+author:
+- John Ky
+- Alexey Raga
+maintainer: [email protected]
+copyright:
+- 2016 John Ky
+- Alexey Raga
+license: BSD3
+github: haskell-works/hw-xml
+homepage: http://github.com/haskell-works/hw-xml#readme
+extra-source-files:
+- README.md
+dependencies:
+- base >=4 && <5
+- bytestring
+- vector
+library:
+  source-dirs: src
+  ghc-options:
+  - -Wall
+  - -O2
+  - -msse4.2
+  exposed-modules:
+  - HaskellWorks.Data.Xml
+  - HaskellWorks.Data.Xml.Blank
+  - HaskellWorks.Data.Xml.CharLike
+  - HaskellWorks.Data.Xml.Conduit
+  - HaskellWorks.Data.Xml.Conduit.Blank
+  - HaskellWorks.Data.Xml.Conduit.Words
+  - HaskellWorks.Data.Xml.Decode
+  - HaskellWorks.Data.Xml.DecodeError
+  - HaskellWorks.Data.Xml.DecodeResult
+  - HaskellWorks.Data.Xml.Grammar
+  - HaskellWorks.Data.Xml.Index
+  - HaskellWorks.Data.Xml.Lens
+  - HaskellWorks.Data.Xml.Succinct
+  - HaskellWorks.Data.Xml.Succinct.Cursor
+  - HaskellWorks.Data.Xml.Succinct.Cursor.BalancedParens
+  - HaskellWorks.Data.Xml.Succinct.Cursor.BlankedXml
+  - HaskellWorks.Data.Xml.Succinct.Cursor.InterestBits
+  - HaskellWorks.Data.Xml.Succinct.Cursor.Internal
+  - HaskellWorks.Data.Xml.Succinct.Cursor.Token
+  - HaskellWorks.Data.Xml.Succinct.Index
+  - HaskellWorks.Data.Xml.RawDecode
+  - HaskellWorks.Data.Xml.RawValue
+  - HaskellWorks.Data.Xml.Token.Tokenize
+  - HaskellWorks.Data.Xml.Token.Types
+  - HaskellWorks.Data.Xml.Token
+  - HaskellWorks.Data.Xml.Type
+  - HaskellWorks.Data.Xml.Value
+  dependencies:
+  - array
+  - ansi-wl-pprint
+  - attoparsec
+  - cereal
+  - conduit
+  - containers
+  - deepseq
+  - ghc-prim
+  - hw-balancedparens >=0.1.0.0
+  - hw-bits >=0.4.0.0
+  - hw-conduit >=0.2.0.2
+  - hw-parser
+  - hw-prim >=0.4.0.0
+  - hw-rankselect >=0.7.0.0
+  - hw-rankselect-base >=0.2.0.0
+  - lens
+  - mtl
+  - resourcet
+  - transformers
+  - word8
+executables:
+  hw-xml-example:
+    main: Main.hs
+    source-dirs: app
+    ghc-options:
+    - -threaded
+    - -rtsopts
+    - -with-rtsopts=-N
+    - -O2
+    - -Wall
+    - -msse4.2
+    dependencies:
+    - hw-balancedparens >=0.2.0.1
+    - hw-bits >=0.7.0.2
+    - hw-prim >=0.5.0.0
+    - hw-rankselect >=0.10.0.3
+    - hw-xml
+tests:
+  hw-xml-test:
+    main: Spec.hs
+    source-dirs: test
+    ghc-options:
+    - -threaded
+    - -rtsopts
+    - -with-rtsopts=-N
+    dependencies:
+    - attoparsec
+    - conduit
+    - hspec
+    - hw-balancedparens >=0.1.0.0
+    - hw-bits >=0.4.0.0
+    - hw-conduit >=0.2.0.2
+    - hw-xml
+    - hw-prim >=0.4.0.0
+    - hw-rankselect >=0.7.0.0
+    - hw-rankselect-base >=0.2.0.0
+    - QuickCheck
+benchmarks:
+  bench:
+    main: Main.hs
+    source-dirs: bench
+    ghc-options:
+    - -O2
+    - -Wall
+    - -msse4.2
+    dependencies:
+    - conduit
+    - criterion
+    - hw-balancedparens >=0.1.0.0
+    - hw-bits >=0.4.0.0
+    - hw-conduit >=0.2.0.2
+    - hw-xml
+    - hw-prim >=0.4.0.0
+    - mmap
+    - resourcet
+data-files:
+- data/catalog.xml

package.yaml

@@ -1,3 +1,6 @@
+{-# LANGUAGE DeriveAnyClass        #-}
+{-# LANGUAGE DeriveGeneric         #-}
+{-# LANGUAGE DerivingStrategies    #-}
 {-# LANGUAGE FlexibleContexts      #-}
 {-# LANGUAGE FlexibleInstances     #-}
 {-# LANGUAGE InstanceSigs          #-}
@@ -9,10 +12,12 @@ module HaskellWorks.Data.Xml.Succinct.Cursor.Internal
   , xmlCursorPos
   ) where
 
+import Control.DeepSeq                                    (NFData)
 import Data.ByteString.Internal                           as BSI
 import Data.String
 import Data.Word
 import Foreign.ForeignPtr
+import GHC.Generics
 import HaskellWorks.Data.Bits.BitShown
 import HaskellWorks.Data.FromByteString
 import HaskellWorks.Data.FromForeignRegion
@@ -37,7 +42,8 @@ data XmlCursor t v w = XmlCursor
   , balancedParens :: !w
   , cursorRank     :: !Count
   }
-  deriving (Eq, Show)
+  deriving (Eq, Show, Generic)
+  deriving anyclass NFData
 
 instance  (FromBlankedXml (XmlInterestBits a), FromBlankedXml (CBP.XmlBalancedParens b))
           => FromByteString (XmlCursor BS.ByteString a b) where

src/HaskellWorks/Data/Xml/Succinct/Cursor/Internal.hs

@@ -1,20 +1,10 @@
-resolver: lts-9.1
+resolver: lts-10.9
 
 packages:
 - '.'
 
 extra-deps:
-  - hedgehog-0.5
-  - hw-balancedparens-0.2.0.1
-  - hw-bits-0.7.0.2
-  - hw-conduit-0.2.0.2
-  - hw-excess-0.2.0.0
-  - hw-int-0.0.0.3
-  - hw-parser-0.0.0.3
-  - hw-prim-0.5.0.0
-  - hw-rankselect-0.10.0.3
-  - hw-rankselect-base-0.2.0.2
-  - hw-string-parse-0.0.0.4
+  - hedgehog-0.5.3
 
 flags: {}