X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fident%2Fident.c;h=fd5c5d1cd1b4ce84714171ae0eebd6497e381ef8;hb=8c9921a1fc166552f6e416434fd8394a4fc210a3;hp=027f02df38693fe161b8fec47f3da15dbbdfa02c;hpb=a973f767f5995ec8ac72d662fb982dfb8594bf5c;p=libfirm

diff --git a/ir/ident/ident.c b/ir/ident/ident.c
index 027f02df3..fd5c5d1cd 100644
--- a/ir/ident/ident.c
+++ b/ir/ident/ident.c
@@ -1,89 +1,114 @@
 /*
- * Project:     libFIRM
- * File name:   ir/common/ident.c
- * Purpose:     Hash table to store names.
- * Author:      Goetz Lindenmaier
- * Modified by:
- * Created:
- * CVS-ID:      $Id$
- * Copyright:   (c) 1999-2003 Universität Karlsruhe
- * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ *
+ * This file is part of libFirm.
+ *
+ * This file may be distributed and/or modified under the terms of the
+ * GNU General Public License version 2 as published by the Free Software
+ * Foundation and appearing in the file LICENSE.GPL included in the
+ * packaging of this file.
+ *
+ * Licensees holding valid libFirm Professional Edition licenses may use
+ * this file in accordance with the libFirm Commercial License.
+ * Agreement provided with the Software.
+ *
+ * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+ * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE.
  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+/**
+ * @file
+ * @brief     Hash table to store names.
+ * @author    Goetz Lindenmaier
+ */
+#include "config.h"
 
 #include <assert.h>
 #include <ctype.h>
+#include <stdio.h>
 #include <string.h>
 #include <stddef.h>
 #include <stdlib.h>
 
 #include "ident_t.h"
-#include "array.h"
 #include "set.h"
+#include "xmalloc.h"
+#include "hashptr.h"
 
 static set *id_set;
 
-void id_init(int initial_n_idents)
+void init_ident(void)
 {
-  id_set = new_set(memcmp, initial_n_idents);
+	/* it's ok to use memcmp here, we check only strings */
+	id_set = new_set(memcmp, 128);
 }
 
-INLINE ident *id_from_str (const char *str, int len)
+ident *new_id_from_chars(const char *str, size_t len)
 {
-  assert(len > 0);
-  return set_hinsert0(id_set, str, len, ID_HASH(str, len));
+	unsigned hash   = HASH_STR(str, len);
+	ident   *result = (ident*) set_hinsert0(id_set, str, len, hash);
+	return result;
 }
 
 ident *new_id_from_str(const char *str)
 {
-  assert(str);
-  return id_from_str(str, strlen(str));
+	assert(str != NULL);
+	return new_id_from_chars(str, strlen(str));
+}
+
+const char *get_id_str(ident *id)
+{
+	struct set_entry *entry = (struct set_entry*) id;
+	return (const char*) entry->dptr;
 }
 
-INLINE const char *get_id_str(ident *id)
+size_t get_id_strlen(ident *id)
 {
-  return (const char *)id->dptr;
+	struct set_entry *entry = (struct set_entry*) id;
+	return entry->size;
 }
 
-INLINE int get_id_strlen(ident *id)
+void finish_ident(void)
 {
-  return id->size;
+	del_set(id_set);
+	id_set = NULL;
 }
 
 int id_is_prefix(ident *prefix, ident *id)
 {
-  if (get_id_strlen(prefix) > get_id_strlen(id)) return 0;
-  return 0 == memcmp(prefix->dptr, id->dptr, get_id_strlen(prefix));
+	size_t prefix_len = get_id_strlen(prefix);
+	if (prefix_len > get_id_strlen(id))
+		return 0;
+	return 0 == memcmp(get_id_str(prefix), get_id_str(id), prefix_len);
 }
 
 int id_is_suffix(ident *suffix, ident *id)
 {
-  int suflen = get_id_strlen(suffix);
-  int idlen  = get_id_strlen(id);
-  char *part;
+	size_t suflen = get_id_strlen(suffix);
+	size_t idlen  = get_id_strlen(id);
+	const char *part;
 
-  if (suflen > idlen) return 0;
+	if (suflen > idlen)
+		return 0;
 
-  part = (char *)id->dptr;
-  part = part + (idlen - suflen);
+	part = get_id_str(id);
+	part = part + (idlen - suflen);
 
-  return 0 == memcmp(suffix->dptr, part, suflen);
+	return 0 == memcmp(get_id_str(suffix), part, suflen);
 }
 
 int id_contains_char(ident *id, char c)
 {
-  return strchr(get_id_str(id), c) != NULL;
+	return strchr(get_id_str(id), c) != NULL;
 }
 
-int print_id (ident *id)
+ident *id_unique(const char *tag)
 {
-  return printf("%s", get_id_str(id));
-}
+	static unsigned unique_id = 0;
+	char buf[256];
 
-int fprint_id (FILE *F, ident *id)
-{
-  return fprintf(F, "%s", get_id_str(id));
+	snprintf(buf, sizeof(buf), tag, unique_id);
+	unique_id++;
+	return new_id_from_str(buf);
 }