X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Fvalueset.c;h=4d73c96d51d5f16768461787ef9d60eae9d2f527;hb=62038ec14e9c072a91b13270058bb18958027aa8;hp=3cbf5582be2580f39fbff2f25df73c8a65f05faf;hpb=abbf9492df1993d211412ba520feb81de0688c2a;p=libfirm

diff --git a/ir/ir/valueset.c b/ir/ir/valueset.c
index 3cbf5582b..4d73c96d5 100644
--- a/ir/ir/valueset.c
+++ b/ir/ir/valueset.c
@@ -21,7 +21,6 @@
  * @file
  * @author    Michael Beck
  * @brief     A value set, containing expression for values.
- * @version   $Id$
  */
 #include "config.h"
 
@@ -52,18 +51,20 @@ static ir_valueset_entry_t null_valueset_entry;
 #define hashset_init            ir_valueset_init
 #define hashset_init_size       ir_valueset_init_size
 #define hashset_destroy         ir_valueset_destroy
-#define hashset_insert          _ir_valueset_insert
+ir_valueset_entry_t *ir_valueset_insert_(ir_valueset_t *self, ir_node *value);
+#define hashset_insert          ir_valueset_insert_
 #define hashset_remove          ir_valueset_remove
-#define hashset_find            _ir_valueset_find
+ir_valueset_entry_t *ir_valueset_find_(const ir_valueset_t *self,
+                                       const ir_node *value);
+#define hashset_find            ir_valueset_find_
 #define hashset_size            ir_valueset_size
 
 #define ADDITIONAL_INIT         INIT_LIST_HEAD(&self->elem_list); INIT_LIST_HEAD(&self->all_iters);
 #define ADDITIONAL_TERM         INIT_LIST_HEAD(&self->elem_list); INIT_LIST_HEAD(&self->all_iters);
 
-#define NO_ITERATOR
 #define HAVE_OWN_RESIZE
 
-#include "hashset.c"
+#include "hashset.c.inl"
 
 /**
  * Resize the hashset
@@ -109,7 +110,7 @@ static void resize(HashSet *self, size_t new_size)
 
 int ir_valueset_insert(ir_valueset_t *valueset, ir_node *value, ir_node *expr)
 {
-	ir_valueset_entry_t *entry = _ir_valueset_insert(valueset, value);
+	ir_valueset_entry_t *entry = ir_valueset_insert_(valueset, value);
 
 	if (entry->list.next != NULL) {
 		/* this value is already inserted, do nothing */
@@ -125,7 +126,7 @@ int ir_valueset_insert(ir_valueset_t *valueset, ir_node *value, ir_node *expr)
 int ir_valueset_replace(ir_valueset_t *valueset, ir_node *value, ir_node *expr)
 {
 	int res = 0;
-	ir_valueset_entry_t *entry = _ir_valueset_insert(valueset, value);
+	ir_valueset_entry_t *entry = ir_valueset_insert_(valueset, value);
 
 	if (entry->expr != expr) {
 		entry->expr = expr;
@@ -141,14 +142,15 @@ int ir_valueset_replace(ir_valueset_t *valueset, ir_node *value, ir_node *expr)
 
 void *ir_valueset_lookup(const ir_valueset_t *valueset, const ir_node *value)
 {
-	ir_valueset_entry_t *entry = _ir_valueset_find(valueset, value);
+	ir_valueset_entry_t *entry = ir_valueset_find_(valueset, value);
 	if (entry != NULL)
 		return entry->expr;
 	return NULL;
 }
 
 void ir_valueset_iterator_init(ir_valueset_iterator_t *iterator,
-                               const ir_valueset_t *valueset) {
+                               const ir_valueset_t *valueset)
+{
 	iterator->iter     = valueset->elem_list.next;
 	iterator->valueset = valueset;
 }