X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=token.c;h=0887d93b1b47bc29e0d24cf9064c6e5cf96c8c71;hp=1ef99cf572fb0cfa9ca7b28b938333ab228e41f5;hb=751aa148a93f2830cf0a56ab9f662a0416127ddc;hpb=2161b198b7b333147c89ef0346d8e9bb6ab9ffd9

diff --git a/token.c b/token.c
index 1ef99cf..0887d93 100644
--- a/token.c
+++ b/token.c
@@ -7,6 +7,7 @@
 //
 
 #include "token.h"
+#include "direct.h"
 #include "error.h"
 #include "macro.h"
 #include "procln.h"
@@ -1161,7 +1162,7 @@ if (debug) printf("TokenizeLine: Calling fpop() from SRC_IREPT...\n");
 		// Handle multiple-character tokens
 		if (c & MULTX)
 		{
-            stringtype = 0;
+
 			switch (*ln++)
 			{
 			case '!':		// ! or !=
@@ -1175,24 +1176,20 @@ if (debug) printf("TokenizeLine: Calling fpop() from SRC_IREPT...\n");
 
 				continue;
 			case '\'':		// 'string'
-                if (m6502)
-                {
-                    stringtype = A8INT; // hardcoded for now, maybe this will change in the future
-                }
-                // Fall through
+				if (m6502)
+				{
+					// Hardcoded for now, maybe this will change in the future
+					*tk++ = STRINGA8;
+					goto dostring;
+				}
+				// Fall through
 			case '\"':		// "string"
-				c1 = ln[-1];
 				*tk++ = STRING;
-//#warning
-// More char * stuffing (8 bytes) into the space of 4 (TOKEN).
-// Need to figure out how to fix this crap.
-#if 0
-				*tk++ = (TOKEN)ln;
-#else
+dostring:
+				c1 = ln[-1];
 				string[stringNum] = ln;
 				*tk++ = stringNum;
 				stringNum++;
-#endif
 
 				for(p=ln; *ln!=EOS && *ln!=c1;)
 				{