Fix formatting errors

Decimal numbers now look nicer, and --no-sparse works properly again.
This commit is contained in:
Joscha 2019-11-19 17:14:00 +00:00
parent a7ef16bc4e
commit f8c5d2766c
2 changed files with 5 additions and 4 deletions

View file

@ -39,7 +39,7 @@ chunkyBin :: T.Text -> T.Text
chunkyBin = chunkedBy " " 4
chunkyDec :: T.Text -> T.Text
chunkyDec = chunkedBy "'" 3
chunkyDec = chunkedBy " " 3
chunkyHex :: T.Text -> T.Text
chunkyHex = chunkedBy " " 2

View file

@ -92,7 +92,8 @@ fFlags a = do
f = feFlags env
memoryFlags = if fcShowMemoryFlags conf then fMemoryFlags f a else ""
registerFlags = if fcShowRegisterFlags conf then fRegisterFlags s a else ""
pure $ memoryFlags <> registerFlags
space = if fcShowMemoryFlags conf || fcShowRegisterFlags conf then " " else ""
pure $ memoryFlags <> registerFlags <> space
{- Addresses -}
@ -146,7 +147,7 @@ fMemoryLn a = do
flags <- fFlags a
addr <- fAddress a
word <- fWord w
pure $ flags <> " " <> addr <> " " <> word <> "\n"
pure $ flags <> addr <> " " <> word <> "\n"
interestingAddresses :: FormatReader (Set.Set MimaAddress)
interestingAddresses = do
@ -166,7 +167,7 @@ getAddresses = do
then do
interesting <- interestingAddresses
pure $ Set.toAscList $ Set.union interesting $ Set.fromList $ usedAddresses mem
else pure $ usedAddresses mem
else pure $ continuousUsedAddresses mem
fMemory :: Formatter
fMemory = do