Garmelon/mima-tools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reorganize things in preparation for formatting

Browse source
This commit is contained in:
Joscha 2019-11-18 09:22:21 +00:00
parent bc2594bf69
commit f3c7cdf8b3
7 changed files with 45 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/Mima/Assembler/Parser.hs
View file

@ -2,6 +2,7 @@
module Mima.Assembler.Parser
( parseState
, readState
) where
import Control.Monad
@ -18,6 +19,7 @@ import Mima.Assembler.Parser.Instruction
import Mima.Assembler.Parser.Label
import Mima.Assembler.Parser.RawInstruction
import Mima.Assembler.Parser.Register
import Mima.Parse.Weed
import Mima.State
import Mima.Word
@ -112,3 +114,6 @@ parseState = do
let mem = mapToMemory $ Map.map rawInstructionToWord rawInstructions
labelNames = Map.fromList $ map (\(k, v) -> (lName k, v)) $ Map.toList labels
pure (stateFromRegisters registers mem, labelNames)
readState :: FilePath -> T.Text -> Either WeedErrorBundle (MimaState, Map.Map T.Text MimaAddress)
readState filename input = parse parseState filename input