used ircons_t.h now

[libfirm] / ir / ident / ident_t.h

diff --git a/ir/ident/ident_t.h b/ir/ident/ident_t.h
index 075d992..ae48cd9 100644 (file)
--- a/ir/ident/ident_t.h
+++ b/ir/ident/ident_t.h
@@ -1,71 +1,50 @@
-/* Declarations for ident.
-   Copyright (C) 1995, 1996 Markus Armbruster */
-
-/* Copyright (C) 1998 - 2000 by Universitaet Karlsruhe
-** All rights reserved.
-**
-** Authors: Martin Trapp, Christian Schaefer
-*/
+/*
+ * Project:     libFIRM
+ * File name:   ir/common/ident_t.h
+ * Purpose:     Hash table to store names -- private header.
+ * 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.
+ */
 
 # ifndef _IDENT_T_H_
 # define _IDENT_T_H_
 
-#include <assert.h>
-#include <stddef.h>
-#include "misc.h"
-#include "set.h"
-#include "ident.h"
-
-# include "xprintf.h"
-# include "xp_help.h"
-
-/* Caution: strings _not_ zero-terminated! */
-#define ID_FROM_STR(str, len) \
-  (assert ((len) > 0), \
-   (const set_entry *)set_hinsert (id_set, (str), (len), ID_HASH ((str), (len))))
-#define ID_TO_STR(id) ((const char *)&(id)->dptr[0])
-#define ID_TO_STRLEN(id) ((id)->size)
-#define ID_TO_HASH(id) ((long)(id) + (id)->hash)
-
-ident *new_id_derived (const char *pfx, ident *);
-ident *new_id_internal (void);
-bool id_is_internal (ident *);
-void id_init (void);
-
-/* Vormals Debugunterstuetzung, entfernt (debug.h). */
-# define ID_VRFY(id) ((void)0)
-
-#ifdef NDEBUG
-# define IDS_VRFY(id) ((void)0)
-#else
-# define IDS_VRFY(id) ids_vrfy ((id))
-void ids_vrfy (ident **id);
-#endif
+# include "ident.h"
+# include "set.h"
 
+void id_init (int initial_n_idents);
+void id_finish (void);
 
-#ifdef STATS
-# define id_stats() set_stats (id_set)
-#else
-# define id_stats() ((void)0)
-#endif
-
-/* Private */
-
-/* @@@ tune */
 #define ID_HASH(str, len) \
   (((  ((unsigned char *)(str))[0] * 33 \
      + ((unsigned char *)(str))[(len)>>1]) * 31 \
     + ((unsigned char *)(str))[(len)-1]) * 9 \
    + (len))
 
-extern set *id_set;
 
-#if 0
-# define id_from_str  ID_FROM_STR
-# define id_to_str    ID_TO_STR
-# define id_to_strlen ID_TO_STRLEN
-#endif
+/* ------------------------ *
+ * inline functions         *
+ * ------------------------ */
+extern set *__id_set;
+
+static INLINE ident *
+__id_from_str(const char *str, int len)
+{
+  assert(len > 0);
+  return set_hinsert0(__id_set, str, len, ID_HASH(str, len));
+}
+
+static INLINE const char * __get_id_str(ident *id) { return (const char *)id->dptr; }
+
+static INLINE int __get_id_strlen(ident *id) { return id->size; }
+
 
-int ident_print (XP_PAR1, const xprintf_info *, XP_PARN);
+#define id_from_str(str, len)    __id_from_str(str, len)
+#define get_id_str(id)           __get_id_str(id)
+#define get_id_strlen(id)        __get_id_strlen(id)
 
 # endif /* _IDENT_T_H_ */