Updates to build on GHC 8

.gitignore

@@ -10,3 +10,4 @@ unitTest.tix
 hpc_report
 stack.yaml
 /dist-newstyle
+.*.swp

crucible-abc/crucible-abc.cabal

@@ -16,7 +16,7 @@ Description:
 
 library
  build-depends:
- base >= 4.7 && < 4.9,
+ base >= 4.7 && < 4.10,
  aig,
  abcBridge >= 0.11,
  ansi-wl-pprint,

crucible-blt/crucible-blt.cabal

@@ -16,7 +16,7 @@ Description:
 
 library
  build-depends:
- base >= 4.7 && < 4.9,
+ base >= 4.7 && < 4.10,
  ansi-wl-pprint,
  blt >= 0.12.1,
  containers,

crucible-saw/crucible-saw.cabal

@@ -15,7 +15,7 @@ Description:
 library
  build-depends:
  ansi-wl-pprint,
- base >= 4.7 && < 4.9,
+ base >= 4.7 && < 4.10,
  containers,
  crucible >= 0.1,
  directory,

crucible-server/crucible-server.cabal

@@ -62,7 +62,7 @@ library
 executable crucible-server
  build-depends:
  ansi-wl-pprint,
- base >= 4.7 && < 4.9,
+ base >= 4.7 && < 4.10,
  crucible,
  crucible-abc,
  crucible-saw,
@@ -77,4 +77,4 @@ executable crucible-server
 
  main-is: Main_crucible.hs
  hs-source-dirs:
- crucible-server
+ crucible-server

crucible/crucible.cabal

@@ -25,7 +25,7 @@ flag unsafe-operations
 
 library
  build-depends:
- base >= 4.7 && < 4.9, 
+ base >= 4.7 && < 4.10,
  ansi-wl-pprint,
  attoparsec,
  bimap >= 0.2,
@@ -149,7 +149,7 @@ library
  Lang.Crucible.Utils.SymMultiDimArray
  Lang.Crucible.Utils.UnaryBV
 
- ghc-options: -Wall -Werror
+ ghc-options: -Wall
  ghc-prof-options: -O2 -fprof-auto-top
 
  if flag(unsafe-operations)

crucible/src/Lang/Crucible/LLVM/MemModel.hs

@@ -8,7 +8,7 @@
 ------------------------------------------------------------------------
 
 {-# LANGUAGE DataKinds #-}
-{-# LANGUAGE FlexibleInstances #-}
+{-# LANGUAGE FlexibleInstances, FlexibleContexts #-}
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE ImplicitParams #-}
 {-# LANGUAGE KindSignatures #-}

crucible/src/Lang/Crucible/Syntax.hs

@@ -451,7 +451,7 @@ concatExprs :: forall w a expr
  -> (forall w'. (1 <= w') => NatRepr w' -> expr (BVType w') -> a)
  -> a
 
-concatExprs _ [] = error "Cannot concatenate 0 elements together"
+concatExprs _ [] = \_ -> error "Cannot concatenate 0 elements together"
 concatExprs w (a:as) = go a as
 
  where go :: (1 <= w)

crucible/src/Lang/Crucible/Utils/Structural.hs

@@ -36,13 +36,14 @@ structuralPretty tpq pats0 = do
  d <- lookupDataType' =<< asTypeCon "structuralPretty" =<< tpq
  pp <- newName "pp"
  a <- newName "a"
+
  let pats = assocTypePats (dataParamTypes d) pats0
  lamE [varP pp, varP a] $
- caseE (varE a) (matchPretty pats (varE pp) <$> dataCtors d)
+  caseE (varE a) (matchPretty pats (varE pp) <$> dataCtors d)
 
 matchPretty :: (Type -> Q (Maybe ExpQ)) -- ^ Pattern match functions
- -> ExpQ -> Con -> MatchQ
-matchPretty matchPat pp (NormalC nm tps) = do
+ -> ExpQ -> NormalizedCon -> MatchQ
+matchPretty matchPat pp (NC nm tps) = do
  let n = length tps
  nms <- replicateM n (newName "x")
  let pat = conP nm (varP <$> nms)
@@ -65,7 +66,5 @@ matchPretty matchPat pp (NormalC nm tps) = do
  = [| brackets (commas (toListFC $(pp) $(v))) |]
  mkPP v _ = [| text (show $(v)) |]
  --mkPP _ tp = error $ "Unsupported type " ++ show tp ++ " with " ++ nameBase nm
- let rhs = [| ppFn $(litE (stringL nm')) $(listE (zipWith mkPP0 vars (snd <$> tps))) |]
+ let rhs = [| ppFn $(litE (stringL nm')) $(listE (zipWith mkPP0 vars tps)) |]
  match pat (normalB rhs) []
-matchPretty patFn pp (ForallC _ _ c) = matchPretty patFn pp c
-matchPretty _ _ c = error $ "Unsupported Con: " ++ show c

galois-matlab/galois-matlab.cabal

@@ -16,7 +16,7 @@ flag enable-hpc
 
 library
  build-depends:
- base >= 4.7 && < 4.9,
+ base >= 4.7 && < 4.10,
  ansi-wl-pprint,
  deepseq,
  hashable,