X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=token.c;h=3031895c1e5e63d5e451ab85166527ddb6b68da3;hp=cc754ab88e65e2f683977a09b44a24f8ba624e38;hb=bb77eaee83ffa56a181fa1b92f4ea7de248a3af4;hpb=f4e9bcd703852c51c97d2586872b9b26389899e6

diff --git a/token.c b/token.c
index cc754ab..3031895 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;
@@ -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;
@@ -906,8 +912,13 @@ retry:
 		if ((ln = GetNextLine()) == NULL)
 		{
 if (verb_flag) printf("TokenizeLine: Calling fpop() from SRC_IFILE...\n");
-			fpop();							// Pop input level
-			goto retry;						// Try for more lines 
+			if (fpop() == 0)				// Pop input level
+				goto retry;					// Try for more lines 
+			else
+			{
+				ifent->if_prev = (IFENT *) - 1;	//Signal Assemble() that we have reached EOF with unbalanced if/endifs
+				return TKEOF;
+			}
 		}
 
 		curlineno++;						// Bump line number
@@ -940,8 +951,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 = '@';
@@ -1636,6 +1649,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)