Fix build

.stylish-haskell.yaml

@@ -0,0 +1,189 @@
+# stylish-haskell configuration file
+# ==================================
+
+# The stylish-haskell tool is mainly configured by specifying steps. These steps
+# are a list, so they have an order, and one specific step may appear more than
+# once (if needed). Each file is processed by these steps in the given order.
+steps:
+  # Convert some ASCII sequences to their Unicode equivalents. This is disabled
+  # by default.
+  # - unicode_syntax:
+  #     # In order to make this work, we also need to insert the UnicodeSyntax
+  #     # language pragma. If this flag is set to true, we insert it when it's
+  #     # not already present. You may want to disable it if you configure
+  #     # language extensions using some other method than pragmas. Default:
+  #     # true.
+  #     add_language_pragma: true
+
+  # Align the right hand side of some elements.  This is quite conservative
+  # and only applies to statements where each element occupies a single
+  # line.
+  - simple_align:
+      cases: true
+      top_level_patterns: true
+      records: true
+
+  # Import cleanup
+  - imports:
+      # There are different ways we can align names and lists.
+      #
+      # - global: Align the import names and import list throughout the entire
+      #   file.
+      #
+      # - file: Like global, but don't add padding when there are no qualified
+      #   imports in the file.
+      #
+      # - group: Only align the imports per group (a group is formed by adjacent
+      #   import lines).
+      #
+      # - none: Do not perform any alignment.
+      #
+      # Default: global.
+      align: group
+
+      # Folowing options affect only import list alignment.
+      #
+      # List align has following options:
+      #
+      # - after_alias: Import list is aligned with end of import including
+      #   'as' and 'hiding' keywords.
+      #
+      #   > import qualified Data.List      as List (concat, foldl, foldr, head,
+      #   >                                          init, last, length)
+      #
+      # - with_alias: Import list is aligned with start of alias or hiding.
+      #
+      #   > import qualified Data.List      as List (concat, foldl, foldr, head,
+      #   >                                 init, last, length)
+      #
+      # - new_line: Import list starts always on new line.
+      #
+      #   > import qualified Data.List      as List
+      #   >     (concat, foldl, foldr, head, init, last, length)
+      #
+      # Default: after_alias
+      list_align: after_alias
+
+      # Long list align style takes effect when import is too long. This is
+      # determined by 'columns' setting.
+      #
+      # - inline: This option will put as much specs on same line as possible.
+      #
+      # - new_line: Import list will start on new line.
+      #
+      # - new_line_multiline: Import list will start on new line when it's
+      #   short enough to fit to single line. Otherwise it'll be multiline.
+      #
+      # - multiline: One line per import list entry.
+      #   Type with contructor list acts like single import.
+      #
+      #   > import qualified Data.Map as M
+      #   >     ( empty
+      #   >     , singleton
+      #   >     , ...
+      #   >     , delete
+      #   >     )
+      #
+      # Default: inline
+      long_list_align: inline
+
+      # Align empty list (importing instances)
+      #
+      # Empty list align has following options
+      #
+      # - inherit: inherit list_align setting
+      #
+      # - right_after: () is right after the module name:
+      #
+      #   > import Vector.Instances ()
+      #
+      # Default: inherit
+      empty_list_align: inherit
+
+      # List padding determines indentation of import list on lines after import.
+      # This option affects 'long_list_align'.
+      #
+      # - <integer>: constant value
+      #
+      # - module_name: align under start of module name.
+      #   Useful for 'file' and 'group' align settings.
+      list_padding: 4
+
+      # Separate lists option affects formating of import list for type
+      # or class. The only difference is single space between type and list
+      # of constructors, selectors and class functions.
+      #
+      # - true: There is single space between Foldable type and list of it's
+      #   functions.
+      #
+      #   > import Data.Foldable (Foldable (fold, foldl, foldMap))
+      #
+      # - false: There is no space between Foldable type and list of it's
+      #   functions.
+      #
+      #   > import Data.Foldable (Foldable(fold, foldl, foldMap))
+      #
+      # Default: true
+      separate_lists: true
+
+  # Language pragmas
+  - language_pragmas:
+      # We can generate different styles of language pragma lists.
+      #
+      # - vertical: Vertical-spaced language pragmas, one per line.
+      #
+      # - compact: A more compact style.
+      #
+      # - compact_line: Similar to compact, but wrap each line with
+      #   `{-#LANGUAGE #-}'.
+      #
+      # Default: vertical.
+      style: vertical
+
+      # Align affects alignment of closing pragma brackets.
+      #
+      # - true: Brackets are aligned in same collumn.
+      #
+      # - false: Brackets are not aligned together. There is only one space
+      #   between actual import and closing bracket.
+      #
+      # Default: true
+      align: true
+
+      # stylish-haskell can detect redundancy of some language pragmas. If this
+      # is set to true, it will remove those redundant pragmas. Default: true.
+      remove_redundant: true
+
+  # Replace tabs by spaces. This is disabled by default.
+  # - tabs:
+  #     # Number of spaces to use for each tab. Default: 8, as specified by the
+  #     # Haskell report.
+  #     spaces: 8
+
+  # Remove trailing whitespace
+  - trailing_whitespace: {}
+
+# A common setting is the number of columns (parts of) code will be wrapped
+# to. Different steps take this into account. Default: 80.
+columns: 800
+
+# By default, line endings are converted according to the OS. You can override
+# preferred format here.
+#
+# - native: Native newline format. CRLF on Windows, LF on other OSes.
+#
+# - lf: Convert to LF ("\n").
+#
+# - crlf: Convert to CRLF ("\r\n").
+#
+# Default: native.
+newline: native
+
+# Sometimes, language extensions are specified in a cabal file or from the
+# command line instead of using language pragmas in the file. stylish-haskell
+# needs to be aware of these, so it can parse the file correctly.
+#
+# No language extensions are enabled by default.
+# language_extensions:
+  # - TemplateHaskell
+  # - QuasiQuotes

hw-json.cabal

@@ -1,5 +1,5 @@
 name:                   hw-json
-version:                0.4.0.0
+version:                0.5.0.0
 synopsis:               Memory efficient JSON parser
 description:            Please see README.md
 homepage:               http://github.com/haskell-works/hw-json#readme
@@ -58,6 +58,7 @@ library
                       , HaskellWorks.Data.Json.Conduit
                       , HaskellWorks.Data.Json.Conduit.Blank
                       , HaskellWorks.Data.Json.Conduit.Words
+                      , HaskellWorks.Data.Json.DecodeError
                       , HaskellWorks.Data.Json.FromValue
                       , HaskellWorks.Data.Json.LightJson
                       , HaskellWorks.Data.Json.Load

src/HaskellWorks/Data/Json/DecodeError.hs

@@ -0,0 +1,5 @@
+module HaskellWorks.Data.Json.DecodeError
+  ( DecodeError(..)
+  ) where
+
+newtype DecodeError = DecodeError String deriving (Eq, Show)

src/HaskellWorks/Data/Json/FromValue.hs

@@ -3,8 +3,8 @@
 
 module HaskellWorks.Data.Json.FromValue where
 
-import           HaskellWorks.Data.Decode
-import           HaskellWorks.Data.Json.Value
+import HaskellWorks.Data.Json.DecodeError
+import HaskellWorks.Data.Json.Value
 
 class FromJsonValue a where
   fromJsonValue :: JsonValue -> Either DecodeError a

src/HaskellWorks/Data/Json/Load.hs

@@ -18,31 +18,32 @@ module HaskellWorks.Data.Json.Load
   , loadJsonWithPoppy512SMinMax2Index
   ) where
 
-import           Control.Monad
+import Control.Monad
+import Data.Word
+import Foreign.ForeignPtr
+import Foreign.Ptr
+import Foreign.Storable
+import HaskellWorks.Data.BalancedParens.RangeMinMax
+import HaskellWorks.Data.BalancedParens.RangeMinMax2
+import HaskellWorks.Data.BalancedParens.Simple
+import HaskellWorks.Data.Bits.BitShown
+import HaskellWorks.Data.FromByteString
+import HaskellWorks.Data.FromForeignRegion
+import HaskellWorks.Data.Json.DecodeError
+import HaskellWorks.Data.Json.PartialValue
+import HaskellWorks.Data.Json.Succinct.Cursor
+import HaskellWorks.Data.Json.Succinct.Index
+import HaskellWorks.Data.Json.Succinct.PartialIndex
+import HaskellWorks.Data.Json.Value
+import HaskellWorks.Data.RankSelect.CsPoppy
+import HaskellWorks.Data.RankSelect.Poppy512
+import HaskellWorks.Data.RankSelect.Poppy512S
+import System.IO
+import System.IO.MMap
+
 import qualified Data.ByteString                                          as BS
 import qualified Data.ByteString.Internal                                 as BSI
 import qualified Data.Vector.Storable                                     as DVS
-import           Data.Word
-import           Foreign.ForeignPtr
-import           Foreign.Ptr
-import           Foreign.Storable
-import           HaskellWorks.Data.BalancedParens.RangeMinMax
-import           HaskellWorks.Data.BalancedParens.RangeMinMax2
-import           HaskellWorks.Data.BalancedParens.Simple
-import           HaskellWorks.Data.Bits.BitShown
-import           HaskellWorks.Data.Decode
-import           HaskellWorks.Data.FromByteString
-import           HaskellWorks.Data.FromForeignRegion
-import           HaskellWorks.Data.Json.PartialValue
-import           HaskellWorks.Data.Json.Succinct.Cursor
-import           HaskellWorks.Data.Json.Succinct.Index
-import           HaskellWorks.Data.Json.Succinct.PartialIndex
-import           HaskellWorks.Data.Json.Value
-import           HaskellWorks.Data.RankSelect.CsPoppy
-import           HaskellWorks.Data.RankSelect.Poppy512
-import           HaskellWorks.Data.RankSelect.Poppy512S
-import           System.IO
-import           System.IO.MMap
 
 -- | Write out a vector verbatim into an open file handle.
 hPutVector :: forall a. Storable a => Handle -> DVS.Vector a -> IO ()

src/HaskellWorks/Data/Json/LoadCursor.hs

@@ -16,29 +16,30 @@ module HaskellWorks.Data.Json.LoadCursor
   , loadJsonWithPoppy512SMinMax2Index
   ) where
 
-import           Control.Monad
+import Control.Monad
+import Data.Word
+import Foreign.ForeignPtr
+import Foreign.Ptr
+import Foreign.Storable
+import HaskellWorks.Data.BalancedParens.RangeMinMax
+import HaskellWorks.Data.BalancedParens.RangeMinMax2
+import HaskellWorks.Data.BalancedParens.Simple
+import HaskellWorks.Data.Bits.BitShown
+import HaskellWorks.Data.FromByteString
+import HaskellWorks.Data.FromForeignRegion
+import HaskellWorks.Data.Json.DecodeError
+import HaskellWorks.Data.Json.Succinct.Cursor
+import HaskellWorks.Data.Json.Succinct.Index
+import HaskellWorks.Data.Json.Value
+import HaskellWorks.Data.RankSelect.CsPoppy
+import HaskellWorks.Data.RankSelect.Poppy512
+import HaskellWorks.Data.RankSelect.Poppy512S
+import System.IO
+import System.IO.MMap
+
 import qualified Data.ByteString                                          as BS
 import qualified Data.ByteString.Internal                                 as BSI
 import qualified Data.Vector.Storable                                     as DVS
-import           Data.Word
-import           Foreign.ForeignPtr
-import           Foreign.Ptr
-import           Foreign.Storable
-import           HaskellWorks.Data.BalancedParens.RangeMinMax
-import           HaskellWorks.Data.BalancedParens.RangeMinMax2
-import           HaskellWorks.Data.BalancedParens.Simple
-import           HaskellWorks.Data.Bits.BitShown
-import           HaskellWorks.Data.Decode
-import           HaskellWorks.Data.FromByteString
-import           HaskellWorks.Data.FromForeignRegion
-import           HaskellWorks.Data.Json.Succinct.Cursor
-import           HaskellWorks.Data.Json.Succinct.Index
-import           HaskellWorks.Data.Json.Value
-import           HaskellWorks.Data.RankSelect.CsPoppy
-import           HaskellWorks.Data.RankSelect.Poppy512
-import           HaskellWorks.Data.RankSelect.Poppy512S
-import           System.IO
-import           System.IO.MMap
 
 -- | Write out a vector verbatim into an open file handle.
 hPutVector :: forall a. Storable a => Handle -> DVS.Vector a -> IO ()

src/HaskellWorks/Data/Json/Succinct/Index.hs

@@ -1,28 +1,29 @@
-{-# LANGUAGE BangPatterns           #-}
-{-# LANGUAGE FlexibleContexts       #-}
-{-# LANGUAGE FlexibleInstances      #-}
-{-# LANGUAGE InstanceSigs           #-}
-{-# LANGUAGE MultiParamTypeClasses  #-}
+{-# LANGUAGE BangPatterns          #-}
+{-# LANGUAGE FlexibleContexts      #-}
+{-# LANGUAGE FlexibleInstances     #-}
+{-# LANGUAGE InstanceSigs          #-}
+{-# LANGUAGE MultiParamTypeClasses #-}
 
 module HaskellWorks.Data.Json.Succinct.Index where
 
-import           Control.Arrow
-import           Control.Monad
-import qualified Data.ByteString                            as BS
-import qualified Data.List                                  as L
-import qualified HaskellWorks.Data.BalancedParens           as BP
-import           HaskellWorks.Data.Bits.BitWise
-import           HaskellWorks.Data.Decode
-import           HaskellWorks.Data.Drop
-import           HaskellWorks.Data.Json.CharLike
-import           HaskellWorks.Data.Json.Succinct
-import           HaskellWorks.Data.Positioning
-import           HaskellWorks.Data.RankSelect.Base.Rank0
-import           HaskellWorks.Data.RankSelect.Base.Rank1
-import           HaskellWorks.Data.RankSelect.Base.Select1
-import           HaskellWorks.Data.TreeCursor
-import           HaskellWorks.Data.Uncons
-import           Prelude hiding (drop)
+import Control.Arrow
+import Control.Monad
+import HaskellWorks.Data.Bits.BitWise
+import HaskellWorks.Data.Drop
+import HaskellWorks.Data.Json.CharLike
+import HaskellWorks.Data.Json.DecodeError
+import HaskellWorks.Data.Json.Succinct
+import HaskellWorks.Data.Positioning
+import HaskellWorks.Data.RankSelect.Base.Rank0
+import HaskellWorks.Data.RankSelect.Base.Rank1
+import HaskellWorks.Data.RankSelect.Base.Select1
+import HaskellWorks.Data.TreeCursor
+import HaskellWorks.Data.Uncons
+import Prelude                                   hiding (drop)
+
+import qualified Data.ByteString                  as BS
+import qualified Data.List                        as L
+import qualified HaskellWorks.Data.BalancedParens as BP
 
 data JsonIndex
   = JsonIndexString BS.ByteString
@@ -45,8 +46,8 @@ instance (BP.BalancedParens w, Rank0 w, Rank1 w, Select1 v, TestBit w) => JsonIn
     Just (!c, _) | isChar_n c         -> Right  JsonIndexNull
     Just (!c, _) | isBraceLeft c      -> JsonIndexObject <$> mapValuesFrom   (firstChild k)
     Just (!c, _) | isBracketLeft c    -> JsonIndexArray  <$> arrayValuesFrom (firstChild k)
-    Just _                            -> Left (DecodeError "Invalid Json Type")
-    Nothing                           -> Left (DecodeError "End of data"      )
+    Just _       -> Left (DecodeError "Invalid Json Type")
+    Nothing      -> Left (DecodeError "End of data"      )
     where ik                = interests k
           bpk               = balancedParens k
           p                 = lastPositionOf (select1 ik (rank1 bpk (cursorRank k)))