Integrate the Data.Bitstream logic.

Author: angerman

cabal.project

@@ -0,0 +1 @@
+packages: *.cabal ../data-bitcode-llvm/*.cabal

data-bitcode.cabal

@@ -1,7 +1,3 @@
--- This file has been generated from package.yaml by hpack version 0.14.1.
---
--- see: https://github.com/sol/hpack
-
 name:                data-bitcode
 version:             0.1.0.0
 synopsis:            bitcode reader and writer
@@ -35,27 +31,62 @@ library
       Data.BitCode.Reader.FromBits
       Data.BitCode.Reader.Monad
       Data.BitCode.Writer
-      Data.BitCode.Writer.Combinators
       Data.BitCode.Writer.Monad
       Data.BitCode.Writer.ToBits
   build-depends:
-      base >= 4.7 && < 5
+      base >= 4.10 && <4.11
+    , pretty
+    , bytestring
+    , binary
+    , containers
+    , base16-bytestring
+    , transformers
+  default-language: Haskell2010
+
+test-suite spec
+  main-is:           Tasty.hs
+  hs-source-dirs:    test
+  other-modules:     BitcodeSpec
+  ghc-options:       -Wall -threaded
+  type:              exitcode-stdio-1.0
+  build-depends:       base
+                     , tasty
+                     , tasty-discover
+                     , tasty-hspec
+                     , process
+                     , filepath
+                     , data-bitcode
+                     -- , data-bitcode-llvm
+                    -- , data-bitcode-llvm
+  default-language:  Haskell2010
+
+benchmark writer
+  type: exitcode-stdio-1.0
+  main-is: Bench.hs
+  hs-source-dirs:
+      bench/src
+  ghc-options: -main-is Bench
+  build-depends:
+      base >= 4.10 && < 5
     , pretty >= 1.1
     , bytestring >= 0.10
     , binary >= 0.8
     , containers >= 0.5
     , base16-bytestring
-    , transformers
+    , criterion
+    , data-bitcode
+  other-modules:
+      Bench
   default-language: Haskell2010
 
-benchmark writer
+benchmark bitcode
   type: exitcode-stdio-1.0
   main-is: Bench.hs
   hs-source-dirs:
       bench/src
   ghc-options: -main-is Bench
   build-depends:
-      base >= 4.7 && < 5
+      base >= 4.10 && < 5
     , pretty >= 1.1
     , bytestring >= 0.10
     , binary >= 0.8
@@ -64,5 +95,4 @@ benchmark writer
     , criterion
     , data-bitcode
   other-modules:
-      Bench
   default-language: Haskell2010

default.nix

@@ -6,8 +6,10 @@ import Data.BitCode
 import Data.BitCode.Writer.Monad as M
 import Data.BitCode.Writer.ToBits
 
+import Data.Word (Word64)
+
 writeFile :: FilePath -> [BitCode] -> IO ()
 writeFile fp = M.writeFile fp . emitTopLevel
 
-emitTopLevel :: [BitCode] -> BitCodeWriter ()
-emitTopLevel = mapM_ (emit . (2::Int,))
+emitTopLevel :: [BitCode] -> Bitstream ()
+emitTopLevel = mapM_ (emit . (2::Word64,))