Code cleanup from last patch, also, version bump for same. :-)

[rmac] / token.h

diff --git a/token.h b/token.h
index 1deec2c96d922e8901df746f9c76ece4a6c0fc98..88d278f11db5f240aa793ac4570e7d4fa83a3147 100644 (file)
--- a/token.h
+++ b/token.h
@@ -25,7 +25,7 @@
 #define IFENT           struct _ifent
 
 // Tunable definitions
-#define LNSIZ           256                                    // Maximum size of a line of text
+#define LNSIZ           1024                           // Maximum size of a line of text
 #define TOKBUFSIZE      400                                    // Size of token-line buffer
 #define QUANTUM         4096L                          // # bytes to eat at a time from a file
 #define LNBUFSIZ        (QUANTUM*2)                    // Size of file's buffer
@@ -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
@@ -119,7 +123,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
@@ -139,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;
@@ -147,9 +150,6 @@ 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[];
 
@@ -160,8 +160,8 @@ 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__
+