/*
* 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
*/
#include <config.h>
+#include "adt/strutil.h"
#include "symbol_table_t.h"
+#include "symbol_t.h"
#include "token_t.h"
#include "adt/hash_string.h"
#include "adt/obst.h"
static inline
void init_symbol_table_entry(symbol_t *entry, const char *string)
{
- entry->string = string;
- entry->ID = T_IDENTIFIER;
- entry->pp_ID = 0;
- entry->declaration = NULL;
+ entry->string = string;
+ entry->ID = T_IDENTIFIER;
+ entry->pp_ID = TP_IDENTIFIER;
+ entry->entity = NULL;
+ entry->pp_definition = NULL;
}
#define HashSet symbol_table_t
#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
#define hashset_init _symbol_table_init
#define hashset_init_size _symbol_table_init_size
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)