summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortomsmeding <tom.smeding@gmail.com>2019-04-21 20:39:33 +0200
committertomsmeding <tom.smeding@gmail.com>2019-04-21 20:39:33 +0200
commit019fadfaf181a8cdaa79334de0b1463a725bda42 (patch)
treee5a71360d2222fac56ee5159b742772b48f3298a
parent7b2f8b602e65ed2462b7d2c5a432d102f0ba6705 (diff)
Build with newer stack LTS
-rw-r--r--Compiler.hs5
-rw-r--r--stack.yaml4
2 files changed, 6 insertions, 3 deletions
diff --git a/Compiler.hs b/Compiler.hs
index 2e3b80b..69b2fd8 100644
--- a/Compiler.hs
+++ b/Compiler.hs
@@ -160,7 +160,10 @@ compileProgram (Program values) = runCM $ do
switchBlock bnext
addIns (RNone, IDiscard ref)
setTerm IExit
- ([firstbb], otherbbs) <- liftM (partition ((== bstart) . bbId) . Map.elems) (gets csBlocks)
+ (bbs, otherbbs) <- liftM (partition ((== bstart) . bbId) . Map.elems) (gets csBlocks)
+ let firstbb = case bbs of
+ [bb] -> bb
+ _ -> error "Multiple bb's with the same ID!"
funcs <- gets csFunctions
datas <- gets csDatas
return (IRProgram (firstbb : otherbbs) funcs datas)
diff --git a/stack.yaml b/stack.yaml
index 5fd7976..95f0e91 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -15,7 +15,7 @@
# resolver:
# name: custom-snapshot
# location: "./custom-snapshot.yaml"
-resolver: lts-11.2
+resolver: lts-13.8
# User packages to be built.
# Various formats can be used as shown in the example below.
@@ -63,4 +63,4 @@ packages:
# extra-lib-dirs: [/path/to/dir]
#
# Allow a newer minor version of GHC than the snapshot specifies
-# compiler-check: newer-minor \ No newline at end of file
+# compiler-check: newer-minor