Version bump for last commit. ;-)

[rmac] / token.h

diff --git a/token.h b/token.h
index c44989c09f7ca99651f9287432c23828b8e909e7..f5910d3279726d13b42dd56a51adb9c1c21dfbfc 100644 (file)
--- a/token.h
+++ b/token.h
@@ -1,7 +1,7 @@
 //
 // RMAC - Reboot's Macro Assembler for the Atari Jaguar Console System
 // TOKEN.H - Token Handling
-// Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 2017 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // Source utilised with the kind permission of Landon Dyer
 //
@@ -43,17 +43,17 @@
 #define SET             149                                    // Set
 #define REG             'R'                                    // Reg
 #define DCOLON          'h'                                    // ::
-#define GE              'i'                                    // >= 
-#define LE              'j'                                    // <= 
-#define NE              'k'                                    // <> or != 
-#define SHR             'l'                                    // >> 
-#define SHL             'm'                                    // << 
-#define UNMINUS         'n'                                    // Unary '-' 
-#define DOTB            'B'                                    // .b or .B or .s or .S 
-#define DOTW            'W'                                    // .w or .W 
-#define DOTL            'L'                                    // .l or .L 
-#define DOTI            'I'                                    // .l or .L 
-#define ENDEXPR         'E'                                    // End of expression 
+#define GE              'i'                                    // >=
+#define LE              'j'                                    // <=
+#define NE              'k'                                    // <> or !=
+#define SHR             'l'                                    // >>
+#define SHL             'm'                                    // <<
+#define UNMINUS         'n'                                    // Unary '-'
+#define DOTB            'B'                                    // .b or .B or .s or .S
+#define DOTW            'W'                                    // .w or .W
+#define DOTL            'L'                                    // .l or .L
+#define DOTI            'I'                                    // .l or .L
+#define ENDEXPR         'E'                                    // End of expression
 
 // ^^ operators
 #define CR_DEFINED      'p'                                    // ^^defined - is symbol defined?
@@ -75,6 +75,12 @@
 #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)
@@ -104,7 +110,7 @@ IFILE {
        char * ifoldfname;              // Old file's name
        int ifoldlineno;                // Old line number
        int ifind;                              // Position in file buffer
-       int ifcnt;                              // #chars left in file buffer 
+       int ifcnt;                              // #chars left in file buffer
        int ifhandle;                   // File's descriptor
        WORD ifno;                              // File number
        char ifbuf[LNBUFSIZ];   // Line buffer
@@ -119,7 +125,6 @@ TOKENSTREAM {
 // Information about a macro invocation
 IMACRO {
        IMACRO * im_link;               // Pointer to ancient IMACROs
-//     LONG * im_nextln;               // Next line to include
        struct LineList * im_nextln;    // Next line to include
        WORD im_nargs;                  // # of arguments supplied on invocation
        WORD im_siz;                    // Size suffix supplied on invocation
@@ -137,7 +142,7 @@ IREPT {
        VALUE ir_count;                 // Repeat count (decrements)
 };
 
-// Globals, externals etc
+// Exported variables
 extern int lnsave;
 extern int curlineno;
 extern char * curfname;
@@ -147,21 +152,18 @@ 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[];
 
-// Prototypes
+// Exported functions
 int include(int, char *);
 void InitTokenizer(void);
 void SetFilenameForErrorReporting(void);
 int TokenizeLine(void);
 int fpop(void);
 int d_goto(WORD);
-//int d_goto(void);
 INOBJ * a_inobj(int);
 void DumpTokenBuffer(void);
 
 #endif // __TOKEN_H__
+