X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=symbol.h;h=bd32a5efc114fc8efd2dfa6f2dfea290831f4411;hp=899ba6aa13fa2ec90688ea5c8d74e90b73cf31b3;hb=e86444a037c470d010786006fbcaa7d6b56effdb;hpb=d28f432296e812643e236d1bfc9b556a7b11c461

diff --git a/symbol.h b/symbol.h
index 899ba6a..bd32a5e 100644
--- a/symbol.h
+++ b/symbol.h
@@ -1,30 +1,55 @@
-////////////////////////////////////////////////////////////////////////////////////////////////////
+//
 // RMAC - Reboot's Macro Assembler for the Atari Jaguar Console System
 // SYMBOL.H - Symbol Handling
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
-// Source Utilised with the Kind Permission of Landon Dyer
+// Source utilised with the kind permission of Landon Dyer
+//
 
 #ifndef __SYMBOL_H__
 #define __SYMBOL_H__
 
-#include "rmac.h"
+#include <inttypes.h>
 
-// Macros
-#define NBUCKETS        256                                 // Number of hash buckets (power of 2)
+// Line lists
+struct LineList
+{
+	struct LineList * next;
+	char * line;
+};
 
-// Globals, externals etc
+// 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
+	char * 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
+};
+
+// Globals, externals, etc.
 extern int curenv;
 extern char subttl[];
+extern int eject(void);
 
-// Prototypes
-SYM *lookup(char *, int, int);
-void init_sym(void);
-SYM *newsym(char *, int, int);
-char *nstring(char *);
-void sym_decl(SYM *);
-int syg_fix(void);
+// Exported functions
+SYM * lookup(char *, int, int);
+void InitSymbolTable(void);
+SYM * NewSymbol(char *, int, int);
+void AddToSymbolDeclarationList(SYM *);
+void ForceUndefinedSymbolsGlobal(void);
 int symtable(void);
 int sy_assign(char *, char *(*)());
+char * GetSymbolNameByUID(uint32_t);
+
+#endif // __SYMBOL_H__
 
-#endif // __SYMBOL_H__
\ No newline at end of file