on master help sign in
Made things compile
f58ae47iko
.gitignore+1
@@ -1,3 +1,4 @@
1.cabal-sandbox
1.cabal-sandbox
2cabal.sandbox.config
2cabal.sandbox.config
3dist/
3dist/
4+.stack-work
Data/Binary/Bits/Get.hs−1
@@ -272,7 +272,6 @@ newtype BitGet a = B { runState :: S -> Get (S,a) }
272
272
273instance Monad BitGet where
273instance Monad BitGet where
274 return x = B $ \s -> return (s,x)
274 return x = B $ \s -> return (s,x)
275− fail str = B $ \s -> putBackState s >> fail str
276 (B f) >>= g = B $ \s -> do (s',a) <- f s
275 (B f) >>= g = B $ \s -> do (s',a) <- f s
277 runState (g a) s'
276 runState (g a) s'
278
277
Data/Binary/Bits/Internal.hs+6−6
@@ -116,13 +116,13 @@ shiftr_w32 :: Word32 -> Int -> Word32
116shiftr_w64 :: Word64 -> Int -> Word64
116shiftr_w64 :: Word64 -> Int -> Word64
117
117
118#if defined(__GLASGOW_HASKELL__) && !defined(__HADDOCK__)
118#if defined(__GLASGOW_HASKELL__) && !defined(__HADDOCK__)
119−shiftl_w8 (W8# w) (I# i) = W8# (w `uncheckedShiftL#` i)
119+shiftl_w8 w i = w `unsafeShiftL` i
120−shiftl_w16 (W16# w) (I# i) = W16# (w `uncheckedShiftL#` i)
120+shiftl_w16 w i = w `unsafeShiftL` i
121−shiftl_w32 (W32# w) (I# i) = W32# (w `uncheckedShiftL#` i)
121+shiftl_w32 w i = w `unsafeShiftL` i
122
122
123−shiftr_w8 (W8# w) (I# i) = W8# (w `uncheckedShiftRL#` i)
123+shiftr_w8 w i = w `unsafeShiftR` i
124−shiftr_w16 (W16# w) (I# i) = W16# (w `uncheckedShiftRL#` i)
124+shiftr_w16 w i = w `unsafeShiftR` i
125−shiftr_w32 (W32# w) (I# i) = W32# (w `uncheckedShiftRL#` i)
125+shiftr_w32 w i = w `unsafeShiftR` i
126
126
127
127
128#if WORD_SIZE_IN_BITS < 64
128#if WORD_SIZE_IN_BITS < 64
stack.yamlnew file+67
@@ -0,0 +1,67 @@
1+# This file was automatically generated by 'stack init'
2+#
3+# Some commonly used options have been documented as comments in this file.
4+# For advanced use and comprehensive documentation of the format, please see:
5+# https://docs.haskellstack.org/en/stable/yaml_configuration/
6+
7+# Resolver to choose a 'specific' stackage snapshot or a compiler version.
8+# A snapshot resolver dictates the compiler version and the set of packages
9+# to be used for project dependencies. For example:
10+#
11+# resolver: lts-3.5
12+# resolver: nightly-2015-09-21
13+# resolver: ghc-7.10.2
14+#
15+# The location of a snapshot can be provided as a file or url. Stack assumes
16+# a snapshot provided as a file might change, whereas a url resource does not.
17+#
18+# resolver: ./custom-snapshot.yaml
19+# resolver: https://example.com/snapshots/2018-01-01.yaml
20+resolver:
21+ url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/6.yaml
22+
23+# User packages to be built.
24+# Various formats can be used as shown in the example below.
25+#
26+# packages:
27+# - some-directory
28+# - https://example.com/foo/bar/baz-0.0.2.tar.gz
29+# subdirs:
30+# - auto-update
31+# - wai
32+packages:
33+- .
34+# Dependency packages to be pulled from upstream that are not in the resolver.
35+# These entries can reference officially published versions as well as
36+# forks / in-progress versions pinned to a git hash. For example:
37+#
38+# extra-deps:
39+# - acme-missiles-0.3
40+# - git: https://github.com/commercialhaskell/stack.git
41+# commit: e7b331f14bcffb8367cd58fbfc8b40ec7642100a
42+#
43+# extra-deps: []
44+
45+# Override default flag values for local packages and extra-deps
46+# flags: {}
47+
48+# Extra package databases containing global packages
49+# extra-package-dbs: []
50+
51+# Control whether we use the GHC we find on the path
52+# system-ghc: true
53+#
54+# Require a specific version of stack, using version ranges
55+# require-stack-version: -any # Default
56+# require-stack-version: ">=2.9"
57+#
58+# Override the architecture used by stack, especially useful on Windows
59+# arch: i386
60+# arch: x86_64
61+#
62+# Extra directories used by stack for building
63+# extra-include-dirs: [/path/to/dir]
64+# extra-lib-dirs: [/path/to/dir]
65+#
66+# Allow a newer minor version of GHC than the snapshot specifies
67+# compiler-check: newer-minor
stack.yaml.locknew file+13
@@ -0,0 +1,13 @@
1+# This file was autogenerated by Stack.
2+# You should not edit this file by hand.
3+# For more information, please see the documentation at:
4+# https://docs.haskellstack.org/en/stable/lock_files
5+
6+packages: []
7+snapshots:
8+- completed:
9+ sha256: 2e7d4a730d8eb5373b2d383fac84efcf7c81e3b7a5fce71b4c2e19a1768f25a6
10+ size: 640239
11+ url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/6.yaml
12+ original:
13+ url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/21/6.yaml