X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=token.h;h=9adabefa06c93b46ccb8dff2e722fd7b75ecc26d;hp=aaa4fd6088e878c94f0d84d7992b8ec344cafebe;hb=5cd8a4814b805f1ef8ce689423eb5eeba12573c5;hpb=2161b198b7b333147c89ef0346d8e9bb6ab9ffd9

diff --git a/token.h b/token.h
index aaa4fd6..9adabef 100644
--- a/token.h
+++ b/token.h
@@ -53,6 +53,10 @@
 #define DOTW            'W'					// .w or .W
 #define DOTL            'L'					// .l or .L
 #define DOTI            'I'					// .l or .L
+#define DOTX			'X'					// .x or .X
+#define DOTD			'D'					// .d or .D
+#define DOTP			'P'					// .p or .P
+#define DOTQ			'Q'					// .q or .Q (essentially an alias for P)
 #define ENDEXPR         'E'					// End of expression
 
 // ^^ operators
@@ -75,12 +79,6 @@
 #define MULTX           64					// Multiple-character tokens
 #define DOT             128					// [bwlsBWSL] for what follows a `.'
 
-// "special" string types
-#define NORMAL          0                   // Standard for PC/ST/whatever
-#define A8INT           1                   // Atari 800 ATASCII translation
-#define PETSCII         2                   // lol
-#define ORICSCII        3                   // lolol
-
 // Conditional assembly structures
 IFENT {
 	IFENT * if_prev;		// Ptr prev .if state block (or NULL)
@@ -144,7 +142,7 @@ IREPT {
 
 // Exported variables
 extern int lnsave;
-extern int curlineno;
+extern uint16_t curlineno;
 extern char * curfname;
 extern WORD cfileno;
 extern TOKEN * tok;
@@ -152,9 +150,11 @@ extern char lnbuf[];
 extern char lntag;
 extern char tolowertab[];
 extern INOBJ * cur_inobj;
+extern unsigned orgactive;
+extern unsigned orgaddr;
+extern LONG sloc;
 extern int mjump_align;
 extern char * string[];
-extern int stringtype;
 
 // Exported functions
 int include(int, char *);