bartek/mvm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve code

Browse Source
This commit is contained in:
Bartłomiej Przemysław Pluta
2021-11-19 17:07:18 +01:00
parent 2c56582460
commit 2737e0a34e
7 changed files with 101 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/VirtualMachine/VM.hs
View File

@@ -10,6 +10,7 @@ import qualified Data.Sequence as S
import qualified Control.Monad.State as ST (get, put)
import Data.Functor ((<&>))
import Control.Monad (unless)
import Util (maybeToExcept)
data VM = VM { _pc :: Int
@@ -85,9 +86,7 @@ isDebug :: Computation Bool
isDebug = get <&> _debug
stackAt :: Int -> String -> Computation Int
stackAt index err = get >>= \vm -> case _stack vm S.!? index of
(Just i) -> return i
Nothing -> throwError err
stackAt index err = get >>= \vm -> maybeToExcept (_stack vm S.!? index) err
frameAt :: Int -> (Int -> Int) -> String -> Computation Int
frameAt index t name = do
@@ -95,9 +94,7 @@ frameAt index t name = do
fp <- getFp
unless (fp > -1) (throwError "No active stack frame")
stackSize <- getStackSize
case _stack vm S.!? (stackSize - fp - 1 - t index) of
(Just i) -> return i
Nothing -> throwError $ "Cannot determine " ++ name ++ " - index " ++ show index ++ " out of frame bounds"
maybeToExcept (_stack vm S.!? (stackSize - fp - 1 - t index)) $ "Cannot determine " ++ name ++ " - index " ++ show index ++ " out of frame bounds"
updateFrameAt :: Int -> Int -> Computation ()
updateFrameAt index value = do