X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=token.c;h=b53b7decbf552b3366ed81df86cc9e057baae13c;hp=03f278ad08795ea7da14fd772fd8cd049e75f678;hb=05d0350b35a6a6b255cb2a3fab7796f5d4ee4d02;hpb=5f23454f7155f0c77ea1bede3f9e60b39da99fa8

diff --git a/token.c b/token.c
index 03f278a..b53b7de 100644
--- a/token.c
+++ b/token.c
@@ -1,5 +1,5 @@
 //
-// RMAC - Reboot's Macro Assembler for the Atari Jaguar Console System
+// RMAC - Reboot's Macro Assembler for all Atari computers
 // TOKEN.C - Token Handling
 // Copyright (C) 199x Landon Dyer, 2011-2017 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
@@ -36,6 +36,7 @@ TOKEN * tok;				// Ptr to current token
 TOKEN * etok;				// Ptr past last token in tokbuf[]
 TOKEN tokeol[1] = {EOL};	// Bailout end-of-line token
 char * string[TOKBUFSIZE*2];	// Token buffer string pointer storage
+int optimizeOff;			// Optimization override flag
 
 // File record, used to maintain a list of every include file ever visited
 #define FILEREC struct _filerec
@@ -48,14 +49,14 @@ FILEREC
 FILEREC * filerec;
 FILEREC * last_fr;
 
-INOBJ * cur_inobj;						// Ptr current input obj (IFILE/IMACRO)
-static INOBJ * f_inobj;					// Ptr list of free INOBJs
-static IFILE * f_ifile;					// Ptr list of free IFILEs
-static IMACRO * f_imacro;				// Ptr list of free IMACROs
+INOBJ * cur_inobj;			// Ptr current input obj (IFILE/IMACRO)
+static INOBJ * f_inobj;		// Ptr list of free INOBJs
+static IFILE * f_ifile;		// Ptr list of free IFILEs
+static IMACRO * f_imacro;	// Ptr list of free IMACROs
 
-static TOKEN tokbuf[TOKBUFSIZE];		// Token buffer (stack-like, all files)
+static TOKEN tokbuf[TOKBUFSIZE];	// Token buffer (stack-like, all files)
 
-char chrtab[] = {
+uint8_t chrtab[0x100] = {
 	ILLEG, ILLEG, ILLEG, ILLEG,			// NUL SOH STX ETX
 	ILLEG, ILLEG, ILLEG, ILLEG,			// EOT ENQ ACK BEL
 	ILLEG, WHITE, ILLEG, ILLEG,			// BS HT LF VT
@@ -79,29 +80,48 @@ char chrtab[] = {
 	MULTX, MULTX,								// : ;
 	MULTX, MULTX, MULTX, STSYM+CTSYM,			// < = > ?
 
-	MULTX, STSYM+CTSYM+HDIGIT,									// @ A
-	(char)((BYTE)DOT)+STSYM+CTSYM+HDIGIT, STSYM+CTSYM+HDIGIT,	// B C
-	(char)((BYTE)DOT)+STSYM+CTSYM+HDIGIT, STSYM+CTSYM+HDIGIT,						// D E
-	STSYM+CTSYM+HDIGIT, STSYM+CTSYM,							// F G
-	STSYM+CTSYM, (char)((BYTE)DOT)+STSYM+CTSYM, STSYM+CTSYM, STSYM+CTSYM,			// H I J K
-	(char)((BYTE)DOT)+STSYM+CTSYM, STSYM+CTSYM, STSYM+CTSYM, STSYM+CTSYM,	// L M N O
-
-	(char)((BYTE)DOT)+STSYM+CTSYM, (char)((BYTE)DOT)+STSYM+CTSYM, STSYM+CTSYM, (char)((BYTE)DOT)+STSYM+CTSYM,	// P Q R S
-	STSYM+CTSYM, STSYM+CTSYM, STSYM+CTSYM, (char)((BYTE)DOT)+STSYM+CTSYM,	// T U V W
-	STSYM+CTSYM, STSYM+CTSYM, STSYM+CTSYM, SELF,				// X Y Z [
-	SELF, SELF, MULTX, STSYM+CTSYM,								// \ ] ^ _
-
-	ILLEG, STSYM+CTSYM+HDIGIT,									// ` a
-	(char)((BYTE)DOT)+STSYM+CTSYM+HDIGIT, STSYM+CTSYM+HDIGIT,	// b c
-	(char)((BYTE)DOT)+STSYM+CTSYM+HDIGIT, STSYM+CTSYM+HDIGIT,						// d e
-	STSYM+CTSYM+HDIGIT, STSYM+CTSYM,							// f g
-	STSYM+CTSYM, (char)((BYTE)DOT)+STSYM+CTSYM, STSYM+CTSYM, STSYM+CTSYM,			// h i j k
-	(char)((BYTE)DOT)+STSYM+CTSYM, STSYM+CTSYM, STSYM+CTSYM, STSYM+CTSYM,	// l m n o
-
-	(char)((BYTE)DOT)+STSYM+CTSYM, (char)((BYTE)DOT)+STSYM+CTSYM, STSYM+CTSYM, (char)((BYTE)DOT)+STSYM+CTSYM,	// p q r s
-	STSYM+CTSYM, STSYM+CTSYM, STSYM+CTSYM, (char)((BYTE)DOT)+STSYM+CTSYM,	// t u v w
-	(char)((BYTE)DOT)+STSYM+CTSYM, STSYM+CTSYM, STSYM+CTSYM, SELF,				// x y z {
-	SELF, SELF, SELF, ILLEG										// | } ~ DEL
+	MULTX, STSYM+CTSYM+HDIGIT,					// @ A
+	DOT+STSYM+CTSYM+HDIGIT, STSYM+CTSYM+HDIGIT,	// B C
+	DOT+STSYM+CTSYM+HDIGIT, STSYM+CTSYM+HDIGIT,	// D E
+	STSYM+CTSYM+HDIGIT, STSYM+CTSYM,			// F G
+	STSYM+CTSYM, DOT+STSYM+CTSYM, STSYM+CTSYM, STSYM+CTSYM,	// H I J K
+	DOT+STSYM+CTSYM, STSYM+CTSYM, STSYM+CTSYM, STSYM+CTSYM,	// L M N O
+
+	DOT+STSYM+CTSYM, DOT+STSYM+CTSYM, STSYM+CTSYM, DOT+STSYM+CTSYM,	// P Q R S
+	STSYM+CTSYM, STSYM+CTSYM, STSYM+CTSYM, DOT+STSYM+CTSYM,	// T U V W
+	STSYM+CTSYM, STSYM+CTSYM, STSYM+CTSYM, SELF,// X Y Z [
+	SELF, SELF, MULTX, STSYM+CTSYM,				// \ ] ^ _
+
+	ILLEG, STSYM+CTSYM+HDIGIT,					// ` a
+	DOT+STSYM+CTSYM+HDIGIT, STSYM+CTSYM+HDIGIT,	// b c
+	DOT+STSYM+CTSYM+HDIGIT, STSYM+CTSYM+HDIGIT,	// d e
+	STSYM+CTSYM+HDIGIT, STSYM+CTSYM,			// f g
+	STSYM+CTSYM, DOT+STSYM+CTSYM, STSYM+CTSYM, STSYM+CTSYM,	// h i j k
+	DOT+STSYM+CTSYM, STSYM+CTSYM, STSYM+CTSYM, STSYM+CTSYM,	// l m n o
+
+	DOT+STSYM+CTSYM, DOT+STSYM+CTSYM, STSYM+CTSYM, DOT+STSYM+CTSYM,	// p q r s
+	STSYM+CTSYM, STSYM+CTSYM, STSYM+CTSYM, DOT+STSYM+CTSYM,	// t u v w
+	DOT+STSYM+CTSYM, STSYM+CTSYM, STSYM+CTSYM, SELF,		// x y z {
+	SELF, SELF, SELF, ILLEG,					// | } ~ DEL
+
+	// Anything above $7F is illegal (and yes, we need to check for this,
+	// otherwise you get strange and spurious errors that will lead you astray)
+	ILLEG, ILLEG, ILLEG, ILLEG, ILLEG, ILLEG, ILLEG, ILLEG,
+	ILLEG, ILLEG, ILLEG, ILLEG, ILLEG, ILLEG, ILLEG, ILLEG,
+	ILLEG, ILLEG, ILLEG, ILLEG, ILLEG, ILLEG, ILLEG, ILLEG,
+	ILLEG, ILLEG, ILLEG, ILLEG, ILLEG, ILLEG, ILLEG, ILLEG,
+	ILLEG, ILLEG, ILLEG, ILLEG, ILLEG, ILLEG, ILLEG, ILLEG,
+	ILLEG, ILLEG, ILLEG, ILLEG, ILLEG, ILLEG, ILLEG, ILLEG,
+	ILLEG, ILLEG, ILLEG, ILLEG, ILLEG, ILLEG, ILLEG, ILLEG,
+	ILLEG, ILLEG, ILLEG, ILLEG, ILLEG, ILLEG, ILLEG, ILLEG,
+	ILLEG, ILLEG, ILLEG, ILLEG, ILLEG, ILLEG, ILLEG, ILLEG,
+	ILLEG, ILLEG, ILLEG, ILLEG, ILLEG, ILLEG, ILLEG, ILLEG,
+	ILLEG, ILLEG, ILLEG, ILLEG, ILLEG, ILLEG, ILLEG, ILLEG,
+	ILLEG, ILLEG, ILLEG, ILLEG, ILLEG, ILLEG, ILLEG, ILLEG,
+	ILLEG, ILLEG, ILLEG, ILLEG, ILLEG, ILLEG, ILLEG, ILLEG,
+	ILLEG, ILLEG, ILLEG, ILLEG, ILLEG, ILLEG, ILLEG, ILLEG,
+	ILLEG, ILLEG, ILLEG, ILLEG, ILLEG, ILLEG, ILLEG, ILLEG,
+	ILLEG, ILLEG, ILLEG, ILLEG, ILLEG, ILLEG, ILLEG, ILLEG
 };
 
 // Names of registers
@@ -263,6 +283,7 @@ INOBJ * a_inobj(int typ)
 
 		inobj->inobj.ifile = ifile;
 		break;
+
 	case SRC_IMACRO:						// Alloc and init an IMACRO
 		if (f_imacro == NULL)
 			imacro = malloc(sizeof(IMACRO));
@@ -274,9 +295,10 @@ INOBJ * a_inobj(int typ)
 
 		inobj->inobj.imacro = imacro;
 		break;
+
 	case SRC_IREPT:							// Alloc and init an IREPT
 		inobj->inobj.irept = malloc(sizeof(IREPT));
-		DEBUG printf("alloc IREPT\n");
+		DEBUG { printf("alloc IREPT\n"); }
 		break;
 	}
 
@@ -434,7 +456,7 @@ copy_d:
 					*d++ = *s++;
 
 				if (*s != '}')
-					return error("missing '}'");
+					return error("missing closing brace ('}')");
 				else
 					s++;
 			}
@@ -443,10 +465,10 @@ copy_d:
 
 			// Lookup the argument and copy its (string) value into the
 			// destination string
-			DEBUG printf("argument='%s'\n", mname);
+			DEBUG { printf("argument='%s'\n", mname); }
 
 			if ((arg = lookup(mname, MACARG, macnum)) == NULL)
-				return errors("undefined argument: '%s'", mname);
+				return error("undefined argument: '%s'", mname);
 			else
 			{
 				// Convert a string of tokens (terminated with EOL) back into
@@ -454,24 +476,18 @@ copy_d:
 				// macro invocation) then it is ignored.
 				i = (int)arg->svalue;
 arg_num:
-				DEBUG printf("~argnumber=%d (argBase=%u)\n", i, imacro->argBase);
+				DEBUG { printf("~argnumber=%d\n", i); }
 				tk = NULL;
 
 				if (i < imacro->im_nargs)
 				{
-#if 0
-//					tk = argp[i];
-//					tk = argPtrs[i];
-					tk = argPtrs[imacro->argBase + i];
-#else
 					tk = imacro->argument[i].token;
 					symbolString = imacro->argument[i].string;
 //DEBUG
 //{
 //	printf("ExM: Preparing to parse argument #%u...\n", i);
-//	dumptok(tk);
+//	DumpTokens(tk);
 //}
-#endif
 				}
 
 				// \?arg yields:
@@ -519,7 +535,7 @@ arg_num:
 #else
 								// This fix should be done for strings too
 								d = symbolString[*tk++];
-DEBUG printf("ExM: SYMBOL=\"%s\"", d);
+DEBUG { printf("ExM: SYMBOL=\"%s\"", d); }
 #endif
 								break;
 							case STRING:
@@ -649,7 +665,7 @@ skipcomments:
 
 overflow:
 	*dst = EOS;
-	DEBUG printf("*** OVERFLOW LINE ***\n%s\n", dest);
+	DEBUG { printf("*** OVERFLOW LINE ***\n%s\n", dest); }
 	return fatal("line too long as a result of macro expansion");
 }
 
@@ -661,7 +677,7 @@ char * GetNextMacroLine(void)
 {
 	IMACRO * imacro = cur_inobj->inobj.imacro;
 //	LONG * strp = imacro->im_nextln;
-	struct LineList * strp = imacro->im_nextln;
+	LLIST * strp = imacro->im_nextln;
 
 	if (strp == NULL)						// End-of-macro
 		return NULL;
@@ -680,26 +696,29 @@ char * GetNextMacroLine(void)
 char * GetNextRepeatLine(void)
 {
 	IREPT * irept = cur_inobj->inobj.irept;
-	LONG * strp = irept->ir_nextln;			// initial null
+//	LONG * strp = irept->ir_nextln;			// initial null
 
 	// Do repeat at end of .rept block's string list
-	if (strp == NULL)
+//	if (strp == NULL)
+	if (irept->ir_nextln == NULL)
 	{
-		DEBUG printf("back-to-top-of-repeat-block count=%d\n", (int)irept->ir_count);
+		DEBUG { printf("back-to-top-of-repeat-block count=%d\n", (int)irept->ir_count); }
 		irept->ir_nextln = irept->ir_firstln;	// copy first line
 
 		if (irept->ir_count-- == 0)
 		{
-			DEBUG printf("end-repeat-block\n");
+			DEBUG { printf("end-repeat-block\n"); }
 			return NULL;
 		}
 
-		strp = irept->ir_nextln;
+//		strp = irept->ir_nextln;
 	}
 
-	strcpy(irbuf, (char *)(irept->ir_nextln + 1));
-	DEBUG printf("repeat line='%s'\n", irbuf);
-	irept->ir_nextln = (LONG *)*strp;
+//	strcpy(irbuf, (char *)(irept->ir_nextln + 1));
+	strcpy(irbuf, irept->ir_nextln->line);
+	DEBUG { printf("repeat line='%s'\n", irbuf); }
+//	irept->ir_nextln = (LONG *)*strp;
+	irept->ir_nextln = irept->ir_nextln->next;
 
 	return irbuf;
 }
@@ -711,23 +730,22 @@ char * GetNextRepeatLine(void)
 int include(int handle, char * fname)
 {
 	// Debug mode
-	if (debug)
-		printf("[include: %s, cfileno=%u]\n", fname, cfileno);
+	DEBUG { printf("[include: %s, cfileno=%u]\n", fname, cfileno); }
 
 	// Alloc and initialize include-descriptors
 	INOBJ * inobj = a_inobj(SRC_IFILE);
 	IFILE * ifile = inobj->inobj.ifile;
 
-	ifile->ifhandle = handle;				// Setup file handle
-	ifile->ifind = ifile->ifcnt = 0;		// Setup buffer indices
-	ifile->ifoldlineno = curlineno;			// Save old line number
-	ifile->ifoldfname = curfname;			// Save old filename
-	ifile->ifno = cfileno;					// Save old file number
+	ifile->ifhandle = handle;			// Setup file handle
+	ifile->ifind = ifile->ifcnt = 0;	// Setup buffer indices
+	ifile->ifoldlineno = curlineno;		// Save old line number
+	ifile->ifoldfname = curfname;		// Save old filename
+	ifile->ifno = cfileno;				// Save old file number
 
 	// NB: This *must* be preincrement, we're adding one to the filecount here!
-	cfileno = ++filecount;					// Compute NEW file number
-	curfname = strdup(fname);				// Set current filename (alloc storage)
-	curlineno = 0;							// Start on line zero
+	cfileno = ++filecount;				// Compute NEW file number
+	curfname = strdup(fname);			// Set current filename (alloc storage)
+	curlineno = 0;						// Start on line zero
 
 	// Add another file to the file-record
 	FILEREC * fr = (FILEREC *)malloc(sizeof(FILEREC));
@@ -735,12 +753,12 @@ int include(int handle, char * fname)
 	fr->frec_name = curfname;
 
 	if (last_fr == NULL)
-		filerec = fr;						// Add first filerec
+		filerec = fr;					// Add first filerec
 	else
-		last_fr->frec_next = fr;			// Append to list of filerecs
+		last_fr->frec_next = fr;		// Append to list of filerecs
 
 	last_fr = fr;
-	DEBUG printf("[include: curfname: %s, cfileno=%u]\n", curfname, cfileno);
+	DEBUG { printf("[include: curfname: %s, cfileno=%u]\n", curfname, cfileno); }
 
 	return OK;
 }
@@ -751,74 +769,79 @@ int include(int handle, char * fname)
 //
 int fpop(void)
 {
-	IFILE * ifile;
-	IMACRO * imacro;
-	LONG * p, * p1;
 	INOBJ * inobj = cur_inobj;
 
-	if (inobj != NULL)
+	if (inobj == NULL)
+		return 0;
+
+	// Pop IFENT levels until we reach the conditional assembly context we
+	// were at when the input object was entered.
+	int numUnmatched = 0;
+
+	while (ifent != inobj->in_ifent)
 	{
-		// Pop IFENT levels until we reach the conditional assembly context we
-		// were at when the input object was entered.
-		int numUnmatched = 0;
+		if (d_endif() != 0)	// Something bad happened during endif parsing?
+			return -1;		// If yes, bail instead of getting stuck in a loop
 
-		while (ifent != inobj->in_ifent)
-		{
-			if (d_endif() != 0)		// Something bad happened during endif parsing?
-				return -1;			// If yes, bail instead of getting stuck in a loop
+		numUnmatched++;
+	}
 
-			numUnmatched++;
-		}
+	// Give a warning to the user that we had to wipe their bum for them
+	if (numUnmatched > 0)
+		warn("missing %d .endif(s)", numUnmatched);
 
-		// Give a warning to the user that we had to wipe their bum for them
-		if (numUnmatched > 0)
-			warni("missing %d .endif(s)", numUnmatched);
+	tok = inobj->in_otok;	// Restore tok and otok
+	etok = inobj->in_etok;
 
-		tok = inobj->in_otok;		// Restore tok and otok
-		etok = inobj->in_etok;
+	switch (inobj->in_type)
+	{
+	case SRC_IFILE:			// Pop and release an IFILE
+	{
+		DEBUG { printf("[Leaving: %s]\n", curfname); }
+
+		IFILE * ifile = inobj->inobj.ifile;
+		ifile->if_link = f_ifile;
+		f_ifile = ifile;
+		close(ifile->ifhandle);			// Close source file
+DEBUG { printf("[fpop (pre):  curfname=%s]\n", curfname); }
+		curfname = ifile->ifoldfname;	// Set current filename
+DEBUG { printf("[fpop (post): curfname=%s]\n", curfname); }
+DEBUG { printf("[fpop: (pre)  cfileno=%d ifile->ifno=%d]\n", (int)cfileno, (int)ifile->ifno); }
+		curlineno = ifile->ifoldlineno;	// Set current line#
+		DEBUG { printf("cfileno=%d ifile->ifno=%d\n", (int)cfileno, (int)ifile->ifno); }
+		cfileno = ifile->ifno;			// Restore current file number
+DEBUG { printf("[fpop: (post) cfileno=%d ifile->ifno=%d]\n", (int)cfileno, (int)ifile->ifno); }
+		break;
+	}
 
-		switch (inobj->in_type)
-		{
-		case SRC_IFILE:				// Pop and release an IFILE
-			if (debug)
-				printf("[Leaving: %s]\n", curfname);
-
-			ifile = inobj->inobj.ifile;
-			ifile->if_link = f_ifile;
-			f_ifile = ifile;
-			close(ifile->ifhandle);			// Close source file
-if (debug)	printf("[fpop (pre):  curfname=%s]\n", curfname);
-			curfname = ifile->ifoldfname;	// Set current filename
-if (debug)	printf("[fpop (post): curfname=%s]\n", curfname);
-if (debug)	printf("[fpop: (pre)  cfileno=%d ifile->ifno=%d]\n", (int)cfileno, (int)ifile->ifno);
-			curlineno = ifile->ifoldlineno;	// Set current line#
-			DEBUG printf("cfileno=%d ifile->ifno=%d\n", (int)cfileno, (int)ifile->ifno);
-			cfileno = ifile->ifno;			// Restore current file number
-if (debug)	printf("[fpop: (post) cfileno=%d ifile->ifno=%d]\n", (int)cfileno, (int)ifile->ifno);
-			break;
-		case SRC_IMACRO:					// Pop and release an IMACRO
-			imacro = inobj->inobj.imacro;
-			imacro->im_link = f_imacro;
-			f_imacro = imacro;
-			break;
-		case SRC_IREPT:						// Pop and release an IREPT
-			DEBUG printf("dealloc IREPT\n");
-			p = inobj->inobj.irept->ir_firstln;
+	case SRC_IMACRO:					// Pop and release an IMACRO
+	{
+		IMACRO * imacro = inobj->inobj.imacro;
+		imacro->im_link = f_imacro;
+		f_imacro = imacro;
+		break;
+	}
 
-			while (p != NULL)
-			{
-				p1 = (LONG *)*p;
-				p = p1;
-			}
+	case SRC_IREPT:						// Pop and release an IREPT
+	{
+		DEBUG { printf("dealloc IREPT\n"); }
+		LLIST * p = inobj->inobj.irept->ir_firstln;
 
-			break;
+		// Deallocate repeat lines
+		while (p != NULL)
+		{
+			free(p->line);
+			p = p->next;
 		}
 
-		cur_inobj = inobj->in_link;
-		inobj->in_link = f_inobj;
-		f_inobj = inobj;
+		break;
+	}
 	}
 
+	cur_inobj = inobj->in_link;
+	inobj->in_link = f_inobj;
+	f_inobj = inobj;
+
 	return 0;
 }
 
@@ -920,16 +943,16 @@ char * GetNextLine(void)
 //
 int TokenizeLine(void)
 {
-	char * ln = NULL;			// Ptr to current position in line
-	char * p;					// Random character ptr
+	uint8_t * ln = NULL;		// Ptr to current position in line
+	uint8_t * p;				// Random character ptr
 	TOKEN * tk;					// Token-deposit ptr
 	int state = 0;				// State for keyword detector
 	int j = 0;					// Var for keyword detector
-	char c;						// Random char
+	uint8_t c;					// Random char
 	VALUE v;					// Random value
-	char * nullspot = NULL;		// Spot to clobber for SYMBOL termination
+	uint8_t * nullspot = NULL;	// Spot to clobber for SYMBOL termination
 	int stuffnull;				// 1:terminate SYMBOL '\0' at *nullspot
-	char c1;
+	uint8_t c1;
 	int stringNum = 0;			// Pointer to string locations in tokenized line
 
 retry:
@@ -949,12 +972,12 @@ retry:
 	case SRC_IFILE:
 		if ((ln = GetNextLine()) == NULL)
 		{
-if (debug) printf("TokenizeLine: Calling fpop() from SRC_IFILE...\n");
+DEBUG { printf("TokenizeLine: Calling fpop() from SRC_IFILE...\n"); }
 			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
+				ifent->if_prev = (IFENT *)-1;	//Signal Assemble() that we have reached EOF with unbalanced if/endifs
 				return TKEOF;
 			}
 		}
@@ -983,27 +1006,29 @@ if (debug) printf("TokenizeLine: Calling fpop() from SRC_IFILE...\n");
 		}
 
 		break;
+
 	// Macro-block:
 	// o  Handle end-of-macro;
 	// o  tag the listing-line with an at (@) sign.
 	case SRC_IMACRO:
 		if ((ln = GetNextMacroLine()) == NULL)
 		{
-			if (ExitMacro() == 0)			// 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
+				return TKEOF;		// Oops, we got a non zero return code, signal EOF
 		}
 
 		lntag = '@';
 		break;
+
 	// Repeat-block:
 	// o  Handle end-of-repeat-block;
 	// o  tag the listing-line with a pound (#) sign.
 	case SRC_IREPT:
 		if ((ln = GetNextRepeatLine()) == NULL)
 		{
-if (debug) printf("TokenizeLine: Calling fpop() from SRC_IREPT...\n");
+			DEBUG { printf("TokenizeLine: Calling fpop() from SRC_IREPT...\n"); }
 			fpop();
 			goto retry;
 		}
@@ -1012,13 +1037,13 @@ if (debug) printf("TokenizeLine: Calling fpop() from SRC_IREPT...\n");
 		break;
 	}
 
-	// Save text of the line.  We only do this during listings and within
+	// Save text of the line. We only do this during listings and within
 	// macro-type blocks, since it is expensive to unconditionally copy every
 	// line.
 	if (lnsave)
 		strcpy(lnbuf, ln);
 
-	// General house-keeping
+	// General housekeeping
 	tok = tokeol;			// Set "tok" to EOL in case of error
 	tk = etok;				// Reset token ptr
 	stuffnull = 0;			// Don't stuff nulls
@@ -1029,16 +1054,26 @@ if (debug) printf("TokenizeLine: Calling fpop() from SRC_IREPT...\n");
 	if (*ln == '*' || *ln == ';' || ((*ln == '/') && (*(ln + 1) == '/')))
 		goto goteol;
 
+	// And here we have a very ugly hack for signalling a single line 'turn off
+	// optimization'. There's really no nice way to do this, so hack it is!
+	optimizeOff = 0;		// Default is to take optimizations as they come
+
+	if (*ln == '!')
+	{
+		optimizeOff = 1;	// Signal that we don't want to optimize this line
+		ln++;				// & skip over the darned thing
+	}
+
 	// Main tokenization loop;
-	// o  skip whitespace;
-	// o  handle end-of-line;
-	// o  handle symbols;
-	// o  handle single-character tokens (operators, etc.);
-	// o  handle multiple-character tokens (constants, strings, etc.).
+	//  o  skip whitespace;
+	//  o  handle end-of-line;
+	//  o  handle symbols;
+	//  o  handle single-character tokens (operators, etc.);
+	//  o  handle multiple-character tokens (constants, strings, etc.).
 	for(; *ln!=EOS;)
 	{
 		// Skip whitespace, handle EOL
-		while ((int)chrtab[*ln] & WHITE)
+		while (chrtab[*ln] & WHITE)
 			ln++;
 
 		// Handle EOL, comment with ';'
@@ -1101,7 +1136,7 @@ if (debug) printf("TokenizeLine: Calling fpop() from SRC_IREPT...\n");
 				v = (VALUE)dotxtab[*ln++];
 
 				if (chrtab[*ln] & CTSYM)
-					return error("misuse of '.', not allowed in symbols");
+					return error("misuse of '.'; not allowed in symbols");
 			}
 
 			// If the symbol is small, check to see if it's really the name of
@@ -1192,7 +1227,6 @@ if (debug) printf("TokenizeLine: Calling fpop() from SRC_IREPT...\n");
 		// Handle multiple-character tokens
 		if (c & MULTX)
 		{
-
 			switch (*ln++)
 			{
 			case '!':		// ! or !=
@@ -1258,6 +1292,11 @@ dostring:
 						case '\\':
 							c = '\\';
 							break;
+                        case '!':
+                            // If we're evaluating a macro
+                            // this is valid and expands to
+                            // "dot-size"
+                            break;
 						default:
 							warn("bad backslash code in string");
 							ln--;
@@ -1523,26 +1562,38 @@ dostring:
 				{
 					v &= 0x000000FF;
 					ln += 2;
+                    *tk++ = CONST;
+                    *tk++ = v;
+                    *tk++ = DOTB;
 				}
 				else if ((*(ln + 1) == 'w') || (*(ln + 1) == 'W'))
 				{
 					v &= 0x0000FFFF;
 					ln += 2;
+                    *tk++ = CONST;
+                    *tk++ = v;
+                    *tk++ = DOTW;
 				}
 				else if ((*(ln + 1) == 'l') || (*(ln + 1) == 'L'))
 				{
 					ln += 2;
-				}
-			}
+                    *tk++ = CONST;
+                    *tk++ = v;
+                    *tk++ = DOTL;
+                }
+            }
+            else
+            {
+                *tk++ = CONST;
+                *tk++ = v;
+            }
 
-			*tk++ = CONST;
-			*tk++ = v;
 //printf("CONST: %i\n", v);
 			continue;
 		}
 
 		// Handle illegal character
-		return error("illegal character");
+		return error("illegal character $%02X found", *ln);
 	}
 
 	// Terminate line of tokens and return "success."
@@ -1587,7 +1638,7 @@ int d_goto(WORD unused)
 		return error("goto not in macro");
 
 	IMACRO * imacro = cur_inobj->inobj.imacro;
-	struct LineList * defln = imacro->im_macro->lineList;
+	LLIST * defln = imacro->im_macro->lineList;
 
 	// Attempt to find the label, starting with the first line.
 	for(; defln!=NULL; defln=defln->next)
@@ -1626,10 +1677,9 @@ int d_goto(WORD unused)
 
 void DumpTokenBuffer(void)
 {
-	TOKEN * t;
 	printf("Tokens [%X]: ", sloc);
 
-	for(t=tokbuf; *t!=EOL; t++)
+	for(TOKEN * t=tokbuf; *t!=EOL; t++)
 	{
 		if (*t == COLON)
 			printf("[COLON]");
@@ -1639,7 +1689,10 @@ void DumpTokenBuffer(void)
 			printf("[CONST: $%X]", (uint32_t)*t);
 		}
 		else if (*t == ACONST)
-			printf("[ACONST]");
+		{
+			printf("[ACONST: $%X, $%X]", (uint32_t)t[1], (uint32_t)t[2]);
+			t += 2;
+		}
 		else if (*t == STRING)
 		{
 			t++;