From 0dce6a79b6154d71817eb1cf9a1ba04f0e6c9775 Mon Sep 17 00:00:00 2001 From: cuz Date: Thu, 2 Nov 2000 22:11:48 +0000 Subject: [PATCH] Removed underlines from struct names git-svn-id: svn://svn.cc65.org/cc65/trunk@431 b7a2c559-68d2-44c3-8de9-860c34a00d81 --- src/ca65/symentry.h | 2 +- src/ca65/symtab.c | 26 +++++++++++++------------- src/common/exprdefs.h | 18 +++++++++--------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/ca65/symentry.h b/src/ca65/symentry.h index bbc1c89ca..628952e23 100644 --- a/src/ca65/symentry.h +++ b/src/ca65/symentry.h @@ -45,7 +45,7 @@ /* Forward declaration for struct SymEntry */ -typedef struct SymEntry_ SymEntry; +typedef struct SymEntry SymEntry; diff --git a/src/ca65/symtab.c b/src/ca65/symtab.c index 7fb88dd1c..8c2af8671 100644 --- a/src/ca65/symtab.c +++ b/src/ca65/symtab.c @@ -83,21 +83,21 @@ #define SF_DBGINFOVAL (SF_DEFINED) /* Structure of a symbol table entry */ -struct SymEntry_ { +struct SymEntry { SymEntry* Left; /* Lexically smaller entry */ - SymEntry* Right; /* Lexically larger entry */ - SymEntry* List; /* List of all entries */ + SymEntry* Right; /* Lexically larger entry */ + SymEntry* List; /* List of all entries */ SymEntry* Locals; /* Root of subtree for local symbols */ - struct SymTable_* SymTab; /* Table this symbol is in, 0 for locals */ + struct SymTable* SymTab; /* Table this symbol is in, 0 for locals */ FilePos Pos; /* File position for this symbol */ unsigned Flags; /* Symbol flags */ unsigned Index; /* Index of import/export entries */ union { - struct ExprNode_* Expr; /* Expression if CONST not set */ + struct ExprNode* Expr; /* Expression if CONST not set */ long Val; /* Value (if CONST set) */ - SymEntry* Sym; /* Symbol (if trampoline entry) */ + SymEntry* Sym; /* Symbol (if trampoline entry) */ } V; - unsigned char InitVal; /* Initializer value */ + unsigned char InitVal; /* Initializer value */ char Name [1]; /* Dynamic allocation */ }; @@ -106,12 +106,12 @@ struct SymEntry_ { /* Definitions for the hash table */ #define MAIN_HASHTAB_SIZE 213 #define SUB_HASHTAB_SIZE 53 -typedef struct SymTable_ SymTable; -struct SymTable_ { - unsigned TableSlots; /* Number of hash table slots */ - unsigned TableEntries; /* Number of entries in the table */ +typedef struct SymTable SymTable; +struct SymTable { + unsigned TableSlots; /* Number of hash table slots */ + unsigned TableEntries; /* Number of entries in the table */ SymTable* BackLink; /* Link to enclosing scope if any */ - SymEntry* Table [1]; /* Dynamic allocation */ + SymEntry* Table [1]; /* Dynamic allocation */ }; @@ -140,7 +140,7 @@ static unsigned ExportCount = 0;/* Counter for export symbols */ static int IsLocal (const char* Name) /* Return true if Name is the name of a local symbol */ -{ +{ return (*Name == LocalStart); } diff --git a/src/common/exprdefs.h b/src/common/exprdefs.h index fec970b72..4e95685e6 100644 --- a/src/common/exprdefs.h +++ b/src/common/exprdefs.h @@ -89,7 +89,7 @@ #define EXPR_FORCEWORD (EXPR_UNARYNODE | 0x05) #define EXPR_FORCEFAR (EXPR_UNARYNODE | 0x06) -#define EXPR_BYTE0 (EXPR_UNARYNODE | 0x08) +#define EXPR_BYTE0 (EXPR_UNARYNODE | 0x08) #define EXPR_BYTE1 (EXPR_UNARYNODE | 0x09) #define EXPR_BYTE2 (EXPR_UNARYNODE | 0x0A) #define EXPR_BYTE3 (EXPR_UNARYNODE | 0x0B) @@ -99,18 +99,18 @@ /* The expression node itself */ -typedef struct ExprNode_ ExprNode; -struct ExprNode_ { +typedef struct ExprNode ExprNode; +struct ExprNode { unsigned char Op; /* Operand/Type */ - ExprNode* Left; /* Left leaf */ - ExprNode* Right; /* Right leaf */ - struct ObjData_* Obj; /* Object file reference (linker) */ + ExprNode* Left; /* Left leaf */ + ExprNode* Right; /* Right leaf */ + struct ObjData* Obj; /* Object file reference (linker) */ union { long Val; /* If this is a value */ - struct SymEntry_* Sym; /* If this is a symbol */ - unsigned SegNum; /* If this is a segment */ + struct SymEntry* Sym; /* If this is a symbol */ + unsigned SegNum; /* If this is a segment */ unsigned ImpNum; /* If this is an import */ - struct Memory_* MemArea; /* If this is a memory area */ + struct Memory* MemArea; /* If this is a memory area */ } V; }; -- 2.39.5