X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=token.c;h=84faa8f157bc5a9157f60e25e88dbda49e4df0f3;hp=ca38406e5707dd07c44abed620dad9b5f5bcdeb9;hb=b5f0b68e38eb78c9dd408dce5354584c56b8e90b;hpb=d1fe92e22362ab81cdf10f09b4847261f3b9899a

diff --git a/token.c b/token.c
index ca38406..84faa8f 100644
--- a/token.c
+++ b/token.c
@@ -554,6 +554,9 @@ DEBUG printf("ExM: SYMBOL=\"%s\"", d);
 							case DOTL:
 								d = ".l";
 								break;
+							case CR_ABSCOUNT:
+								d = "^^abscount";
+								break;
 							case CR_DATE:
 								d = "^^date";
 								break;
@@ -617,7 +620,7 @@ overflow:
 //
 char * GetNextMacroLine(void)
 {
-	unsigned source_addr;
+//	unsigned source_addr;
 
 	IMACRO * imacro = cur_inobj->inobj.imacro;
 //	LONG * strp = imacro->im_nextln;
@@ -728,7 +731,10 @@ int fpop(void)
 		// Pop IFENT levels until we reach the conditional assembly context we
 		// were at when the input object was entered.
 		while (ifent != inobj->in_ifent)
-			d_endif();
+		{
+			if (d_endif() != 0)				// Something bad happened during endif parsing?
+				return -1;					// If yes, bail instead of getting stuck in a loop
+		}
 
 		tok = inobj->in_otok;				// Restore tok and otok
 		etok = inobj->in_etok;
@@ -940,8 +946,10 @@ if (verb_flag) printf("TokenizeLine: Calling fpop() from SRC_IFILE...\n");
 	case SRC_IMACRO:
 		if ((ln = GetNextMacroLine()) == NULL)
 		{
-			ExitMacro();					// Exit macro (pop args, do fpop(), etc)
-			goto retry;						// Try for more lines...
+			if (ExitMacro() == 0)			// Exit macro (pop args, do fpop(), etc)
+				goto retry;					// Try for more lines...
+			else
+				return TKEOF;				// Oops, we got a non zero return code, signal EOF
 		}
 
 		lntag = '@';
@@ -1547,7 +1555,7 @@ int d_goto(WORD unused)
 			// Compare names (sleazo string compare)
 			// This string compare is not right. Doesn't check for lengths.
 			// (actually it does, but in a crappy, unclear way.)
-#warning "!!! Bad string comparison !!!"
+WARNING(!!!! Bad string comparison !!!)
 			s1 = sym;
 //			s2 = (char *)(defln + 1) + 1;
 			s2 = defln->line;
@@ -1636,6 +1644,8 @@ void DumpTokenBuffer(void)
 			printf("[DOTI]");
 		else if (*t == ENDEXPR)
 			printf("[ENDEXPR]");
+		else if (*t == CR_ABSCOUNT)
+			printf("[CR_ABSCOUNT]");
 		else if (*t == CR_DEFINED)
 			printf("[CR_DEFINED]");
 		else if (*t == CR_REFERENCED)