X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=symbol_table.c;h=64f2c224d9bd62310868e101a534c7d97a3b2553;hb=f841aae9fc133569d1e703eb9b27fd84eddaf397;hp=e6e458930115256126100a844869bbdde1bac903;hpb=9081de598f497369098ad9241de7553273481ea4;p=cparser

diff --git a/symbol_table.c b/symbol_table.c
index e6e4589..64f2c22 100644
--- a/symbol_table.c
+++ b/symbol_table.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of cparser.
- * Copyright (C) 2007-2008 Matthias Braun <matze@braunis.de>
+ * Copyright (C) 2007-2009 Matthias Braun <matze@braunis.de>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -30,10 +30,10 @@ struct obstack symbol_obstack;
 static inline
 void init_symbol_table_entry(symbol_t *entry, const char *string)
 {
-	entry->string      = string;
-	entry->ID          = T_IDENTIFIER;
-	entry->pp_ID       = TP_IDENTIFIER;
-	entry->declaration = NULL;
+	entry->string = string;
+	entry->ID     = T_IDENTIFIER;
+	entry->pp_ID  = TP_IDENTIFIER;
+	entry->entity = NULL;
 }
 
 #define HashSet                    symbol_table_t
@@ -45,7 +45,7 @@ void init_symbol_table_entry(symbol_t *entry, const char *string)
 #define KeyType                    const char *
 #define ConstKeyType               const char *
 #define GetKey(value)              (value)->string
-#define InitData(this,value,key)   { (value) = (ValueType) obstack_alloc(&symbol_obstack, sizeof(symbol_t)); init_symbol_table_entry((value), key); }
+#define InitData(this,value,key)   ((void)((value) = (ValueType)obstack_alloc(&symbol_obstack, sizeof(symbol_t)), init_symbol_table_entry((value), key)))
 #define Hash(this, key)            hash_string(key)
 #define KeysEqual(this,key1,key2)  (strcmp(key1, key2) == 0)
 #define SetRangeEmpty(ptr,size)    memset(ptr, 0, (size) * sizeof(symbol_table_hash_entry_t))
@@ -66,9 +66,9 @@ void init_symbol_table_entry(symbol_t *entry, const char *string)
 
 static symbol_table_t  symbol_table;
 
-symbol_t *symbol_table_insert(const char *symbol)
+symbol_t *symbol_table_insert(const char *string)
 {
-	return _symbol_table_insert(&symbol_table, symbol);
+	return _symbol_table_insert(&symbol_table, string);
 }
 
 void init_symbol_table(void)