From 3e0f4e22b1d7ff33be6f19cc2d9a05c01df064e8 Mon Sep 17 00:00:00 2001
From: Joscha <joscha@plugh.de>
Date: Wed, 25 Mar 2020 14:58:40 +0000
Subject: [PATCH] Update resolver to 15.2

---
 src/Mima/Instruction.hs | 4 ----
 src/Mima/State.hs       | 3 +--
 stack.yaml              | 2 +-
 stack.yaml.lock         | 8 ++++----
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/Mima/Instruction.hs b/src/Mima/Instruction.hs
index 1de42e8..73d1a61 100644
--- a/src/Mima/Instruction.hs
+++ b/src/Mima/Instruction.hs
@@ -107,8 +107,6 @@ parseSmallInstruction mw = do
   so <- parseSmallOpcode (getSmallOpcode mw)
   pure $ SmallInstruction so (getLargeValue mw)
 
--- Assumes that all bits not part of the opcode are zeroed. The opcode
--- uses the lowest four bits.
 parseSmallOpcode :: Opcode -> Either T.Text SmallOpcode
 parseSmallOpcode w = case smallOpcodeMap Map.!? w of
   Just oc -> pure oc
@@ -120,8 +118,6 @@ parseLargeInstruction mw = do
   lo <- parseLargeOpcode (getLargeOpcode mw)
   pure $ LargeInstruction lo (getSmallValue mw)
 
--- Assumes that all bits not part of the opcode are zeroed. The opcode
--- uses the lowest four bits.
 parseLargeOpcode :: Opcode -> Either T.Text LargeOpcode
 parseLargeOpcode w = case largeOpcodeMap Map.!? w of
   Just oc -> pure oc
diff --git a/src/Mima/State.hs b/src/Mima/State.hs
index 7638753..29e116c 100644
--- a/src/Mima/State.hs
+++ b/src/Mima/State.hs
@@ -25,7 +25,6 @@ import           Control.Monad.Trans.Except
 import           Control.Monad.Trans.Reader
 import           Data.Bits
 import qualified Data.Map.Strict as Map
-import           Data.Maybe
 import qualified Data.Text as T
 
 import           Mima.Flag
@@ -99,7 +98,7 @@ runExecution :: Flags (MimaAddress -> Bool) -> Execution a -> Either AbortReason
 runExecution f exec = runExcept $ runReaderT exec f
 
 failWith :: AbortReason -> Execution a
-failWith = lift . except . Left
+failWith = lift . throwE
 
 incrementIAR :: MimaState -> Execution MimaState
 incrementIAR ms =
diff --git a/stack.yaml b/stack.yaml
index 38e0939..95f5735 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -17,7 +17,7 @@
 #
 # resolver: ./custom-snapshot.yaml
 # resolver: https://example.com/snapshots/2018-01-01.yaml
-resolver: lts-14.14
+resolver: lts-15.2
 
 # User packages to be built.
 # Various formats can be used as shown in the example below.
diff --git a/stack.yaml.lock b/stack.yaml.lock
index fae8990..29a05ee 100644
--- a/stack.yaml.lock
+++ b/stack.yaml.lock
@@ -13,7 +13,7 @@ packages:
     hackage: OddWord-1.0.2.0@sha256:5d848ff5db2c0457ce37ccc8898ce2b6b880a1c6a78e5b16841328a7404ff5ee,1888
 snapshots:
 - completed:
-    size: 525663
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/14/14.yaml
-    sha256: 6edc48df46eb8bf7b861e98dd30d021a92c2e1820c9bb6528aac5d997b0e14ef
-  original: lts-14.14
+    size: 491372
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/15/2.yaml
+    sha256: a98d091d911606d0d8adccbeb811b81bbd8cc2d888f99ef9e273350e8e9692a8
+  original: lts-15.2