From 5bfd2e4357729c0bb8483f2787cfafe7dfad2686 Mon Sep 17 00:00:00 2001
From: I-Al-Istannen <i-al-istannen@users.noreply.github.com>
Date: Tue, 31 Mar 2020 12:03:52 +0200
Subject: [PATCH] Fix address and number parser

* The order in the address parser was wrong

* The signed number *optionally* required a sign. Due to this every
  address was relative. Now the `signedNumber` *required* a sign and the
  previous behaviour was renamed to `optionallySignedNumber`.
---
 src/Mima/Asm/Phase1.hs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/Mima/Asm/Phase1.hs b/src/Mima/Asm/Phase1.hs
index 6ecad39..293139f 100644
--- a/src/Mima/Asm/Phase1.hs
+++ b/src/Mima/Asm/Phase1.hs
@@ -218,12 +218,15 @@ number =
   (chunk "0x" *> hexadecimal) <|>
   decimal
 
+optionallySignedNumber :: (Num a) => Parser a
+optionallySignedNumber = signed (pure ()) number -- do not allow any space
+
 signedNumber :: (Num a) => Parser a
-signedNumber = signed empty number
+signedNumber = lookAhead (char '+' <|> char '-') *> optionallySignedNumber
 
 boundedNumber :: (Bounded n, Num n) => Parser n
 boundedNumber = do
-  n <- signedNumber :: Parser Integer
+  n <- optionallySignedNumber :: Parser Integer
   when (n < minVal || n > maxVal) $ fail $
     "invalid range: " ++
     show n ++ " is not between " ++
@@ -235,8 +238,8 @@ boundedNumber = do
 
 address :: Parser (Address Span)
 address =
-  fmap (uncurry AddressAbsolute) (withSpan boundedNumber) <|>
-  fmap (uncurry AddressRelative) (withSpan signedNumber)
+  fmap (uncurry AddressRelative) (withSpan signedNumber) <|>
+  fmap (uncurry AddressAbsolute) (withSpan boundedNumber)
 
 location :: Parser (Location Span)
 location = (LocationAddress <$> address) <|> (LocationLabel <$> name)