shithub: rgbds

Info  •  Files  •  Log  •  Branches

Make `=` a separate token from `SET`

This does break backwards compat, but if anyone complains I'm gonna be mad

--- a/src/asm/asmy.y

+++ b/src/asm/asmy.y

@@ -565,6 +565,7 @@

 %token	<tzSym> T_ID

 %token	<tzSym> T_POP_EQU

 %token	<tzSym> T_POP_SET

+%token	<tzSym> T_POP_EQUAL

 %token	<tzSym> T_POP_EQUS

 %token	T_POP_INCLUDE T_POP_PRINTF T_POP_PRINTT T_POP_PRINTV T_POP_PRINTI

@@ -970,6 +971,10 @@

 ;

 set		: T_LABEL T_POP_SET const

+		{

+			sym_AddSet($1, constexpr_GetConstantValue(&$3));

+		}

+		| T_LABEL T_POP_EQUAL const

 		{

 			sym_AddSet($1, constexpr_GetConstantValue(&$3));

 		}

--- a/src/asm/globlex.c

+++ b/src/asm/globlex.c

@@ -540,7 +540,7 @@

 	/*  Handled before in list of CPU instructions */

 	/* {"set", T_POP_SET}, */

-	{"=", T_POP_SET},

+	{"=", T_POP_EQUAL},

 	{"pushs", T_POP_PUSHS},

 	{"pops", T_POP_POPS},