X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=macro.c;h=54d34c43687b3cae932b9c7b5387e55b36a9ce99;hp=46443463317e265a30d1950241c7056c3e3aa645;hb=eace4e1b294ccec54a5c476619f616f5da0bf8a9;hpb=f3c7d186a15b89c39e360b9cc89545a0d24bd6a4

diff --git a/macro.c b/macro.c
index 4644346..54d34c4 100644
--- a/macro.c
+++ b/macro.c
@@ -153,10 +153,10 @@ int DefineMacro(void)
 	// Setup entry in symbol table, make sure the macro isn't a duplicate
 	// entry, and that it doesn't override any processor mnemonic or assembler
 	// directive.
-	if (*tok.u32++ != SYMBOL)
+	if (*tok++ != SYMBOL)
 		return error("missing symbol");
 
-	char * name = string[*tok.u32++];
+	char * name = string[*tok++];
 
 	if (lookup(name, MACRO, 0) != NULL)
 		return error("duplicate macro definition");
@@ -166,7 +166,7 @@ int DefineMacro(void)
 	curmac->sattr = (WORD)(macnum++);
 
 	// Parse and define formal arguments in symbol table
-	if (*tok.u32 != EOL)
+	if (*tok != EOL)
 	{
 		argno = 0;
 		symlist(defmac2);
@@ -307,19 +307,19 @@ static int LNCatch(int (* lnfunc)(), char * dirlist)
 		char * p = NULL;
 		int k = -1;
 
-		if (*tok.u32 == SYMBOL)
+		if (*tok == SYMBOL)
 		{
 			// A string followed by a colon or double colon is a symbol and
 			// *not* a directive, see if we can find the directive after it
-			if ((tok.u32[2] == ':' || tok.u32[2] == DCOLON))
+			if ((tok[2] == ':' || tok[2] == DCOLON))
 			{
-				if (tok.u32[3] == SYMBOL)
-					p = string[tok.u32[4]];
+				if (tok[3] == SYMBOL)
+					p = string[tok[4]];
 			}
 			else
 			{
 				// Otherwise, just grab the directive
-				p = string[tok.u32[1]];
+				p = string[tok[1]];
 			}
 		}
 
@@ -389,7 +389,7 @@ static int KWMatch(char * kw, char * kwlist)
 //
 int InvokeMacro(SYM * mac, WORD siz)
 {
-	DEBUG { printf("InvokeMacro: arguments="); DumpTokens(tok.u32); }
+	DEBUG { printf("InvokeMacro: arguments="); DumpTokens(tok); }
 
 	INOBJ * inobj = a_inobj(SRC_IMACRO);	// Alloc and init IMACRO
 	IMACRO * imacro = inobj->inobj.imacro;
@@ -397,46 +397,46 @@ int InvokeMacro(SYM * mac, WORD siz)
 
 	// Chop up the arguments, if any (tok comes from token.c, which at this
 	// point points at the macro argument token stream)
-	if (*tok.u32 != EOL)
+	if (*tok != EOL)
 	{
 		// Parse out the arguments and set them up correctly
 		TOKEN * p = imacro->argument[nargs].token;
 		int stringNum = 0;
 
-		while (*tok.u32 != EOL)
+		while (*tok != EOL)
 		{
-			if (*tok.u32 == ACONST)
+			if (*tok == ACONST)
 			{
 				for(int i=0; i<3; i++)
-					*p++ = *tok.u32++;
+					*p++ = *tok++;
 			}
-			else if (*tok.u32 == CONST)		// Constants are 64-bits
+			else if (*tok == CONST)		// Constants are 64-bits
 			{
-				*p++ = *tok.u32++;			// Token
+				*p++ = *tok++;			// Token
 				uint64_t *p64 = (uint64_t *)p;
-				uint64_t *tok64 = (uint64_t *)tok.u32;
+				uint64_t *tok64 = (uint64_t *)tok;
 				*p64++ = *tok64++;
-				tok.u32 = (TOKEN *)tok64;
+				tok = (TOKEN *)tok64;
 				p = (uint32_t *)p64;
 			}
-			else if ((*tok.u32 == STRING) || (*tok.u32 == SYMBOL))
+			else if ((*tok == STRING) || (*tok == SYMBOL))
 			{
-				*p++ = *tok.u32++;
-				imacro->argument[nargs].string[stringNum] = strdup(string[*tok.u32++]);
+				*p++ = *tok++;
+				imacro->argument[nargs].string[stringNum] = strdup(string[*tok++]);
 				*p++ = stringNum++;
 			}
-			else if (*tok.u32 == ',')
+			else if (*tok == ',')
 			{
 				// Comma delimiter was found, so set up for next argument
 				*p++ = EOL;
-				tok.u32++;
+				tok++;
 				stringNum = 0;
 				nargs++;
 				p = imacro->argument[nargs].token;
 			}
 			else
 			{
-				*p++ = *tok.u32++;
+				*p++ = *tok++;
 			}
 		}