Version bump for last patch; now at v1.13.4.

[rmac] / token.h

diff --git a/token.h b/token.h
index f8df49ae19cc2c50bc197790e9397d20d363638e..e20402bfd59db523f888ba41ad9a241c1e173f5d 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-2018 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // Source utilised with the kind permission of Landon Dyer
 //
@@ -34,6 +34,7 @@
 // (Normally) non-printable tokens
 #define COLON           ':'                    // : (grumble: GNUmacs hates ':')
 #define CONST           'a'                    // CONST <value>
+#define FCONST          'r'                    // Floating CONST <value>
 #define ACONST          'A'                    // ACONST <value> <attrib>
 #define STRING          'b'                    // STRING <address>
 #define STRINGA8        'S'                    // Atari 800 internal STRING <address>
@@ -144,7 +145,8 @@ IMACRO {
 IREPT {
        LLIST * ir_firstln;             // Pointer to first line
        LLIST * ir_nextln;              // Pointer to next line
-       VALUE ir_count;                 // Repeat count (decrements)
+       uint32_t ir_count;              // Repeat count (decrements)
+       uint32_t lineno;                // Repeat line number (Convert this to global instead of putting it here?)
 };
 
 // Exported variables
@@ -159,7 +161,7 @@ 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 *);
@@ -169,6 +171,7 @@ int TokenizeLine(void);
 int fpop(void);
 int d_goto(WORD);
 INOBJ * a_inobj(int);
+void DumpToken(TOKEN);
 void DumpTokenBuffer(void);
 
 #endif // __TOKEN_H__