X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=symbol_table.c;h=cc81662a32849ed88851eb705d2586c7416b68a6;hb=7473d9545525216a1276296dbc1759e07972cf96;hp=cef042104f3c0da85eca3f37d1b7e78723e76cd2;hpb=1c622ff40fc61cbef1202888d3184215d88de680;p=cparser

diff --git a/symbol_table.c b/symbol_table.c
index cef0421..cc81662 100644
--- a/symbol_table.c
+++ b/symbol_table.c
@@ -1,24 +1,10 @@
 /*
  * This file is part of cparser.
- * Copyright (C) 2007-2008 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
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Copyright (C) 2012 Matthias Braun <matze@braunis.de>
  */
 #include <config.h>
 
+#include "adt/strutil.h"
 #include "symbol_table_t.h"
 #include "symbol_t.h"
 #include "token_t.h"
@@ -30,14 +16,14 @@ 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_NULL;
+	entry->entity        = NULL;
+	entry->pp_definition = NULL;
 }
 
 #define HashSet                    symbol_table_t
-#define HashSetIterator            symbol_table_iterator_t
 #define HashSetEntry               symbol_table_hash_entry_t
 #define ValueType                  symbol_t*
 #define NullValue                  NULL
@@ -45,35 +31,35 @@ 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 KeysEqual(this,key1,key2)  (streq(key1, key2))
 #define SetRangeEmpty(ptr,size)    memset(ptr, 0, (size) * sizeof(symbol_table_hash_entry_t))
+#define SCALAR_RETURN
 
+void _symbol_table_init(symbol_table_t *symbol_table);
 #define hashset_init            _symbol_table_init
-#define hashset_init_size       _symbol_table_init_size
+void _symbol_table_destroy(symbol_table_t *symbol_table);
 #define hashset_destroy         _symbol_table_destroy
+symbol_t *_symbol_table_insert(symbol_table_t *symbol_table, const char *key);
 #define hashset_insert          _symbol_table_insert
-#define hashset_remove          _symbol_table_remove
-#define hashset_find            _symbol_table_find
-#define hashset_size            _symbol_table_size
-#define hashset_iterator_init   _symbol_table_iterator_init
-#define hashset_iterator_next   _symbol_table_iterator_next
-#define hashset_remove_iterator _symbol_table_remove_iterator
 
-#include "adt/hashset.c"
+#include "adt/hashset.c.inl"
 
 static symbol_table_t  symbol_table;
 
-symbol_t *symbol_table_insert(const char *symbol)
+symbol_t *sym_anonymous;
+
+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)
 {
 	obstack_init(&symbol_obstack);
 	_symbol_table_init(&symbol_table);
+	sym_anonymous = symbol_table_insert("<anonymous>");
 }
 
 void exit_symbol_table(void)