Fix a small buglet in the last patch. :-)

[rmac] / token.h

diff --git a/token.h b/token.h
index 3867f7e8a59560863980345d90b92e64e2908205..18ca4239666e672f2f1f4deaa5865dc0b90dabcb 100644 (file)
--- a/token.h
+++ b/token.h
@@ -1,7 +1,7 @@
 //
 // RMAC - Reboot's Macro Assembler for all Atari computers
 // TOKEN.H - Token Handling
-// Copyright (C) 199x Landon Dyer, 2011-2017 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 2011-2020 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // Source utilised with the kind permission of Landon Dyer
 //
@@ -63,6 +63,8 @@
 #define DOTQ            'Q'                    // .q or .Q (essentially an alias for P)
 #define DOTS            'S'                    // .s or .S (FPU Single)
 #define ENDEXPR         'E'                    // End of expression
+#define UNLT            0x81           // Unary '<' (low byte)
+#define UNGT            0x82           // Unary '>' (high byte)
 
 // ^^ operators
 #define CR_DEFINED      'p'                    // ^^defined - is symbol defined?
@@ -72,7 +74,8 @@
 #define CR_TIME         'x'                    // ^^time - DOS format time
 #define CR_DATE         'y'                    // ^^date - DOS format date
 #define CR_ABSCOUNT     'z'                    // ^^abscount - count the number of bytes
-                                                                       // defined in curent .abs section
+                                                                       // defined in current .abs section
+#define CR_FILESIZE     'F'                    // ^^filesize - return the size in bytes of a file
 
 // Character Attributes
 #define ILLEG           0                      // Illegal character (unused)
@@ -146,6 +149,7 @@ IREPT {
        LLIST * ir_firstln;             // Pointer to first line
        LLIST * ir_nextln;              // Pointer to next line
        uint32_t ir_count;              // Repeat count (decrements)
+       uint32_t lineno;                // Repeat line number (Convert this to global instead of putting it here?)
 };
 
 // Exported variables
@@ -153,14 +157,14 @@ extern int lnsave;
 extern uint16_t curlineno;
 extern char * curfname;
 extern WORD cfileno;
-extern TOKENPTR tok;
+extern TOKEN * tok;
 extern char lnbuf[];
 extern char lntag;
 extern char tolowertab[];
 extern INOBJ * cur_inobj;
 extern int mjump_align;
 extern char * string[];
-int optimizeOff;
+extern int optimizeOff;
 
 // Exported functions
 int include(int, char *);