X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=symbol.h;h=47ea3cd3298e0c543d2f6d8ac9c4f790b9b04e20;hp=b7350e0adf6373702b59a1511070fb67b8764d58;hb=bdbf34766f4d074a5933eb1326fe4ce03d249e10;hpb=03dd34951a331e0b8971195ccef1600fffaea2e6

diff --git a/symbol.h b/symbol.h
index b7350e0..47ea3cd 100644
--- a/symbol.h
+++ b/symbol.h
@@ -1,7 +1,7 @@
 //
 // RMAC - Reboot's Macro Assembler for all Atari computers
 // SYMBOL.H - Symbol Handling
-// Copyright (C) 199x Landon Dyer, 2011-2017 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 2011-2019 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // Source utilised with the kind permission of Landon Dyer
 //
@@ -12,28 +12,30 @@
 #include <inttypes.h>
 
 // Line lists
-struct LineList
+#define LLIST struct _llist
+LLIST
 {
-	struct LineList * next;
+	LLIST * next;
 	uint8_t * line;
+	int lineno;
 };
 
 // Symbols
 #define SYM struct _sym
 SYM
 {
-	SYM * snext;					// * -> Next symbol on hash-chain
-	SYM * sorder;					// * -> Next sym in order of reference
-	SYM * sdecl;					// * -> Next sym in order of declaration
-	uint8_t stype;					// Symbol type
-	uint16_t sattr;					// Attribute bits
-	uint32_t sattre;				// Extended attribute bits
-	uint16_t senv;					// Enviroment number
-	uint32_t svalue;				// Symbol value
-	uint8_t * sname;				// * -> Symbol's print-name
-	struct LineList * lineList;		// * -> Macro's linked list of lines
-	struct LineList * last;			// * -> end of macro linked list
-	uint32_t uid;					// Symbol's unique ID
+	SYM * snext;			// * -> Next symbol on hash-chain
+	SYM * sorder;			// * -> Next sym in order of reference
+	SYM * sdecl;			// * -> Next sym in order of declaration
+	uint8_t stype;			// Symbol type
+	uint16_t sattr;			// Attribute bits
+	uint32_t sattre;		// Extended attribute bits
+	uint16_t senv;			// Enviroment number
+	uint64_t svalue;		// Symbol value (now 64-bit)
+	uint8_t * sname;		// * -> Symbol's print-name
+	LLIST * lineList;		// * -> Macro's linked list of lines
+	LLIST * last;			// * -> end of macro linked list
+	uint32_t uid;			// Symbol's unique ID
 };
 
 // Exported variables