X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fadt%2Feset.c;h=0a88eb971f71481ae828dda4697d478bf376116a;hb=1852308bd33b77378f0fca9e5347d4f9082464c4;hp=0538884b58703eb4110883d4f5f4f0ed8a627646;hpb=2eac1656f9f2a371127b9a5fac43cbf0648002c0;p=libfirm

diff --git a/ir/adt/eset.c b/ir/adt/eset.c
index 0538884b5..0a88eb971 100644
--- a/ir/adt/eset.c
+++ b/ir/adt/eset.c
@@ -1,39 +1,57 @@
 /*
- * Project:     libFIRM
- * File name:   ir/adt/eset.c
- * Purpose:     Datentyp: Vereinfachte Menge (hash-set) zum Speichern von
- *              Zeigern/Adressen.
- * Author:      Hubert Schmid
- * Modified by:
- * Created:     09.06.2002
- * CVS-ID:      $Id$
- * Copyright:   (c) 2002 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.
  */
 
+/**
+ * @file
+ * @brief       A pointer hash-set (WARNING: deprecated!)
+ * @author      Hubert Schmid
+ * @date        09.06.2002
+ * @version     $Id$
+ */
+#include "config.h"
+
 #include "eset.h"
 #include "set.h"
-
+#include "hashptr.h"
 
 struct eset {
   int dummy; /* dummy entry */
 };
 
 
-static const int INITIAL_SLOTS = 64;
+#define INITIAL_SLOTS 64
 
+static int pcmp(const void *p1, const void *p2, size_t size) {
+  const void **q1 = (const void **)p1;
+  const void **q2 = (const void **)p2;
+  (void) size;
 
-static int pcmp(const void * * p1, const void * * p2, size_t size) {
-  return *p1 == *p2 ? 0 : 1;
+  return *q1 != *q2;
 }
 
 
 eset * eset_create(void) {
-  return (eset *) new_set((set_cmp_fun) pcmp, INITIAL_SLOTS);
+  return (eset *) new_set(pcmp, INITIAL_SLOTS);
 }
 
 
-eset * eset_copy(eset * source) {
+eset * eset_copy(eset *source) {
   eset * ret = eset_create();
   void * p;
   for (p = eset_first(source); p; p = eset_next(source)) {
@@ -43,37 +61,41 @@ eset * eset_copy(eset * source) {
 }
 
 
-void eset_destroy(eset * s) {
-  del_set((set *) s);
+void eset_destroy(eset *s) {
+  del_set((set *)s);
 }
 
+/* Returns the number of elements in the set. */
+int eset_count(eset *s) {
+  return set_count((set *)s);
+}
 
-void eset_insert(eset * s, void * p) {
+void eset_insert(eset *s, void *p) {
   if (!eset_contains(s, p)) {
-    set_insert((set *) s, &p, sizeof(void *), (unsigned) p);
+    set_insert((set *)s, &p, sizeof(p), HASH_PTR(p));
   }
 }
 
 
-bool eset_contains(eset * s, void * p) {
-  return set_find((set *) s, &p, sizeof(void *), (unsigned) p) != NULL;
+int eset_contains(eset *s, void *p) {
+  return set_find((set *)s, &p, sizeof(p), HASH_PTR(p)) != NULL;
 }
 
 
-void * eset_first(eset * s) {
+void * eset_first(eset *s) {
   void * p = set_first((set *) s);
-  return p == NULL ? NULL : *((void * *) p);
+  return p == NULL ? NULL : *((void **)p);
 }
 
 
 void * eset_next(eset *s) {
-  void * p = set_next((set *) s);
-  return p == NULL ? NULL : *((void * *) p);
+  void *p = set_next((set *) s);
+  return p == NULL ? NULL : *((void **)p);
 }
 
 
-void eset_insert_all(eset * target, eset * source) {
-  void * p;
+void eset_insert_all(eset *target, eset *source) {
+  void *p;
   for (p = eset_first(source); p; p = eset_next(source)) {
     eset_insert(target, p);
   }