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

Switch assembler to new parser

Browse source
This commit is contained in:
Joscha 2019-11-21 18:27:27 +00:00
parent ee5c2762d6
commit fa4cd218ab
7 changed files with 2 additions and 547 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/MimaAsm/Main.hs
View file

@ -3,9 +3,9 @@ module Main where
import Control.Monad.Trans.Class
import Options.Applicative
import Mima.Assembler.Parser
import Mima.IO
import Mima.Load
import Mima.Parse.Assembly
data Settings = Settings
{ infile :: String
@ -33,7 +33,7 @@ main = doRun_ $ do
settings <- lift $ execParser opts
lift $ putStrLn $ "Loading assembly file at " ++ infile settings
(state, _) <- loadFile readState (infile settings)
(state, _, _) <- loadFile readAssembly (infile settings)
lift $ putStrLn "Parsing successful"
lift $ putStrLn $ "Writing result to " ++ outfile settings