From 112098514d412c79e14c45c89b806ebdc68abdd0 Mon Sep 17 00:00:00 2001
From: ISSOtm <eldredhabert0@gmail.com>
Date: Tue, 11 Feb 2020 18:59:55 +0100
Subject: [PATCH] Fix 1 s/r and 1 r/r conflict

Implements the fix suggested [here](https://github.com/rednex/rgbds/issues/44#issuecomment-69360499), which performed better than expected!
I'm not \*too\* fond of this but this seems like the right way
---
 src/asm/asmy.y | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/asm/asmy.y b/src/asm/asmy.y
index c01fe9f9..6224fe57 100644
--- a/src/asm/asmy.y
+++ b/src/asm/asmy.y
@@ -498,10 +498,12 @@ static void strsubUTF8(char *dest, const char *src, uint32_t pos, uint32_t len)
 }
 
 %type	<sVal>		relocconst
+%type	<sVal>		relocconst_no_str
 %type	<nConstValue>	const
 %type	<nConstValue>	uconst
 %type	<nConstValue>	const_3bit
 %type	<sVal>		const_8bit
+%type	<sVal>		const_8bit_no_str
 %type	<sVal>		const_16bit
 %type	<nConstValue>	sectiontype
 
@@ -1146,7 +1148,7 @@ constlist_8bit_entry : /* empty */
 			out_Skip(1);
 			nListCountEmpty++;
 		}
-		| const_8bit
+		| const_8bit_no_str
 		{
 			out_RelByte(&$1);
 		}
@@ -1198,6 +1200,14 @@ const_8bit	: relocconst
 		}
 ;
 
+const_8bit_no_str	: relocconst_no_str
+		{
+			if( (rpn_isKnown(&$1)) && (($1.nVal < -128) || ($1.nVal > 255)) )
+				warning(WARNING_TRUNCATION, "Expression must be 8-bit");
+			$$ = $1;
+		}
+;
+
 const_16bit	: relocconst
 		{
 			if ((rpn_isKnown(&$1)) && (($1.nVal < -32768) || ($1.nVal > 65535)))
@@ -1207,14 +1217,7 @@ const_16bit	: relocconst
 ;
 
 
-relocconst	: T_ID
-		{
-			rpn_Symbol(&$$, $1);
-		}
-		| T_NUMBER
-		{
-			rpn_Number(&$$, $1);
-		}
+relocconst	: relocconst_no_str
 		| string
 		{
 			char *s = $1;
@@ -1224,6 +1227,16 @@ relocconst	: T_ID
 			free(s);
 			rpn_Number(&$$, r);
 		}
+;
+
+relocconst_no_str	: T_ID
+		{
+			rpn_Symbol(&$$, $1);
+		}
+		| T_NUMBER
+		{
+			rpn_Number(&$$, $1);
+		}
 		| T_OP_LOGICNOT relocconst %prec NEG	{ rpn_LOGNOT(&$$, &$2); }
 		| relocconst T_OP_LOGICOR relocconst	{ rpn_BinaryOp(RPN_LOGOR, &$$, &$1, &$3); }
 		| relocconst T_OP_LOGICAND relocconst	{ rpn_BinaryOp(RPN_LOGAND, &$$, &$1, &$3); }