From 019fadfaf181a8cdaa79334de0b1463a725bda42 Mon Sep 17 00:00:00 2001 From: tomsmeding Date: Sun, 21 Apr 2019 20:39:33 +0200 Subject: Build with newer stack LTS --- Compiler.hs | 5 ++++- stack.yaml | 4 ++-- 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 -- cgit v1.2.3