X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=expr.c;h=44fd892bab2d0594170dd834741b411dc9498284;hp=debcd8884d06915ad75b007ccc72866265407081;hb=03dd34951a331e0b8971195ccef1600fffaea2e6;hpb=ff2052bcaa1428a33a202822a81a6f9b8e567ef4

diff --git a/expr.c b/expr.c
index debcd88..44fd892 100644
--- a/expr.c
+++ b/expr.c
@@ -1,7 +1,7 @@
 //
-// RMAC - Reboot's Macro Assembler for the Atari Jaguar Console System
+// RMAC - Reboot's Macro Assembler for all Atari computers
 // EXPR.C - Expression Analyzer
-// Copyright (C) 199x Landon Dyer, 2017 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 2011-2017 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // Source utilised with the kind permission of Landon Dyer
 //
@@ -287,6 +287,20 @@ int expr2(void)
 		*evalTokenBuffer++ = (orgactive ? orgaddr : pcloc);
 		// '*' takes attributes of current section, not ABS!
 		*evalTokenBuffer++ = cursect | DEFINED;
+		break;
+	case '{':
+		if (expr0() != OK)							// Eat up first parameter (register or immediate)
+			return ERROR;
+
+		if (*tok++ != ':')							// Demand a ':' there
+			return error("missing colon ':'");
+
+		if (expr0() != OK)							// Eat up second parameter (register or immediate)
+			return ERROR;
+
+		if (*tok++ != '}')
+			return error("missing close bracket '}'");
+
 		break;
 	default:
 		return error("bad expression");
@@ -464,17 +478,12 @@ thrown away right here. What the hell is it for?
 //
 int evexpr(TOKEN * tk, VALUE * a_value, WORD * a_attr, SYM ** a_esym)
 {
-	WORD * sattr;
-	VALUE * sval;
 	WORD attr;
 	SYM * sy;
-	SYM * esym;
-	WORD sym_seg;
-
-	sval = evstk;							// (Empty) initial stack
-	sattr = evattr;
-	esym = NULL;							// No external symbol involved
-	sym_seg = 0;
+	VALUE * sval = evstk;					// (Empty) initial stack
+	WORD * sattr = evattr;
+	SYM * esym = NULL;						// No external symbol involved
+	WORD sym_seg = 0;
 
 	while (*tk != ENDEXPR)
 	{
@@ -744,7 +753,7 @@ printf("EVEXPR (-): sym1 = %X, sym2 = %X\n", attr, sattr[1]);
 	// sym_seg added in 1.0.16 to solve a problem with forward symbols in
 	// expressions where absolute values also existed. The absolutes were
 	// overiding the symbol segments and not being included :(
-	//*a_attr = *sattr | sym_seg;                                        // Copy value + attrib
+	//*a_attr = *sattr | sym_seg;           // Copy value + attrib
 
 	*a_attr = *sattr;						// Copy value + attrib
 	*a_value = *sval;