Fix for bug #51. Now at v2.0.22.

[rmac] / token.h

diff --git a/token.h b/token.h
index 4931bb0a1a26d82b9b916aa9e91bced6715213b9..251a503f424036a705edf559b3ecd9302b85d56b 100644 (file)
--- a/token.h
+++ b/token.h
@@ -17,16 +17,17 @@
 #define SRC_IREPT       2                      // Input source is IREPT
 
 // Macros
-#define INOBJ           struct _inobj
-#define IUNION          union _iunion
-#define IFILE           struct _incldfile
-#define IMACRO          struct _imacro
-#define IREPT           struct _irept
-#define IFENT           struct _ifent
+#define INOBJ          struct _inobj
+#define IUNION         union  _iunion
+#define IFILE          struct _incldfile
+#define TOKENSTREAM    struct _tokenstream
+#define IMACRO         struct _imacro
+#define IREPT          struct _irept
+#define IFENT          struct _ifent
 
 // Tunable definitions
 #define LNSIZ           1024           // Maximum size of a line of text
-#define TOKBUFSIZE      400                    // Size of token-line buffer
+#define TOKBUFSIZE      4096           // 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
 #define KWSIZE          7                      // Maximum size of keyword in kwtab.h
@@ -74,7 +75,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)
@@ -125,10 +127,14 @@ IFILE {
        char ifbuf[LNBUFSIZ];   // Line buffer
 };
 
-#define TOKENSTREAM struct _tokenstream
+// Consts for maximums in TOKENSTREAM
+#define TS_MAXTOKENS   64      // 32 ought to be enough for anybody (including XiA!)
+#define TS_MAXSTRINGS  32      // same for attached strings
+#define TS_MAXARGS             20      // Assume no more than 20 arguments in an invocation
+
 TOKENSTREAM {
-       TOKEN token[32];                // 32 ought to be enough for anybody (including XiA!)
-       char * string[32];              // same for attached strings
+       TOKEN token[TS_MAXTOKENS];
+       char * string[TS_MAXSTRINGS];
 };
 
 // Information about a macro invocation
@@ -140,7 +146,7 @@ IMACRO {
        LONG im_olduniq;                // Old value of 'macuniq'
        SYM * im_macro;                 // Pointer to macro we're in
        char im_lnbuf[LNSIZ];   // Line buffer
-       TOKENSTREAM argument[20];       // Assume no more than 20 arguments in an invocation
+       TOKENSTREAM argument[TS_MAXARGS];
 };
 
 // Information about a .rept invocation
@@ -153,7 +159,7 @@ IREPT {
 
 // Exported variables
 extern int lnsave;
-extern uint16_t curlineno;
+extern uint32_t curlineno;
 extern char * curfname;
 extern WORD cfileno;
 extern TOKEN * tok;