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

Store 'File's

Browse source
This commit is contained in:
Joscha 2019-11-25 11:22:51 +00:00
parent d5d29a8180
commit 02b6d65b8f
3 changed files with 41 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/MimaAsm/Main.hs
View file

@ -33,7 +33,7 @@ main = doRun_ $ do
settings <- lift $ execParser opts
lift $ putStrLn $ "Loading assembly file at " ++ infile settings
(state, _, _) <- loadFile' readAssembly (infile settings)
(state, _, _) <- loadFile readAssembly (infile settings)
lift $ putStrLn "Parsing successful"
lift $ putStrLn $ "Writing result to " ++ outfile settings

5
app/MimaRun/Main.hs
View file

@ -112,7 +112,7 @@ loadFlags :: Settings -> Run (Flags (MimaAddress -> Bool))
loadFlags settings = do
let file = getFlagFile settings
printFile "flags" file
mRawFlags <- loadFile readFlagFile file
mRawFlags <- loadFile' readFlagFile file
pure $ case mRawFlags of
Nothing -> noFlags
Just flagSpec -> interpretFlagSpec $ getFlagSpec flagSpec
@ -121,7 +121,7 @@ loadSymbols :: Settings -> Run LabelSpec
loadSymbols settings = do
let file = getSymbolFile settings
printFile "symbols" file
fromMaybe noLabels <$> loadFile readSymbolFile file
fromMaybe noLabels <$> loadFile' readSymbolFile file
{- Other functions -}
@ -154,7 +154,6 @@ printState ms flags labels settings = do
lift $ putStrLn "Dump of MiMa state:"
lift $ T.putStrLn $ formatState formatEnv
-- TODO exception handling
main :: IO ()
main = doRun_ $ do
settings <- lift $ execParser opts