used ircons_t.h now

[libfirm] / ir / ident / ident.h

diff --git a/ir/ident/ident.h b/ir/ident/ident.h
index 46b31fb..cfba365 100644 (file)
--- a/ir/ident/ident.h
+++ b/ir/ident/ident.h
@@ -1,12 +1,14 @@
-/* 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:     Data type for unique 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.
+ */
 /**
  * @file ident.h
  *
@@ -15,7 +17,6 @@
  * Identifiers are used in the firm library. This is the interface to it.
  */
 
-/* $Id$ */
 
 # ifndef _IDENT_H_
 # define _IDENT_H_
@@ -26,13 +27,6 @@
 
 /* Identifiers */
 
-/**
- * Initialises the ident handling.
- *
- * Must be called before any id_*() function can be called.
- */
-void id_init(void);
-
 /**
  *  The abstract data type ident.
  *
@@ -45,16 +39,32 @@ typedef const struct set_entry ident;
  *  Store a string and create an ident.
  *
  *  Stores a string in the ident module and returns a handle for the string.
- *  Copies the string.
+ *
+ *  Copies the string. @p str must be zero terminated
+ *
+ * @param str - the string which shall be stored
+ *
+ * @return id - a handle for the generated ident
+ *
+ * @see get_id_str(), get_id_strlen()
+ */
+ident *new_id_from_str (const char *str);
+
+/**
+ *  Store a string and create an ident.
+ *
+ *  Stores a string in the ident module and returns a handle for the string.
+ *
+ *  Copies the string. This version can take non-zero-terminated strings
  *
  * @param str - the string (or whatever) which shall be stored
  * @param len - the length of the data in bytes
  *
  * @return id - a handle for the generated ident
  *
- * @see id_to_str(), id_to_strlen()
+ * @see new_get_id_str(), get_id_strlen()
  */
-INLINE ident      *id_from_str (const char *str, int len);
+ident *id_from_str (const char *str, int len);
 
 /**
  * Returns a string represented by an ident.
@@ -66,9 +76,10 @@ INLINE ident      *id_from_str (const char *str, int len);
  *
  * @return cp - a string
  *
- * @see id_from_str(), id_to_strlen()
+ * @see new_get_id_str(), id_from_str(), get_id_strlen()
  */
-INLINE const char *id_to_str   (ident *id);
+const char *get_id_str  (ident *id);
+#define id_to_str  get_id_str
 
 /**
  * Returns the length of the string represented by an ident.
@@ -77,17 +88,17 @@ INLINE const char *id_to_str   (ident *id);
  *
  * @return len - the length of the string
  *
- * @see id_from_str(), id_to_str()
+ * @see new_get_id_str(), id_from_str(), get_id_str()
  */
-INLINE int  id_to_strlen(ident *id);
-
+int  get_id_strlen(ident *id);
+#define id_to_strlen get_id_strlen
 /**
  * Returns true if prefix is a prefix of an ident.
  *
  * @param prefix - the prefix
  * @param id     - the ident
  *
- * @see id_from_str(), id_to_str(), id_is_prefix()
+ * @see new_get_id_str(), id_from_str(), get_id_str(), id_is_prefix()
  */
 int id_is_prefix (ident *prefix, ident *id);
 
@@ -97,10 +108,30 @@ int id_is_prefix (ident *prefix, ident *id);
  * @param suffix - the suffix
  * @param id     - the ident
  *
- * @see id_from_str(), id_to_str(), id_is_prefix()
+ * @see new_get_id_str(), id_from_str(), get_id_str(), id_is_prefix()
  */
 int id_is_suffix (ident *suffix, ident *id);
 
+/**
+ * Returns true if infix is a contained in id.  (Can be suffix or prefix)
+ *
+ * @param infix  - the infix
+ * @param id     - the ident to search in
+ *
+ * @see new_get_id_str(), id_from_str(), get_id_str(), id_is_prefix()
+ */
+/* int id_contains(ident *infix, ident *id); */
+
+/**
+ * Return true if an ident contains a given character.
+ *
+ * @param id     - the ident
+ * @param c      - the character
+ *
+ * @see new_get_id_str(), id_from_str(), get_id_str()
+ */
+int id_contains_char (ident *id, char c);
+
 /**
  * Prints the ident to stdout.
  *
@@ -109,7 +140,7 @@ int id_is_suffix (ident *suffix, ident *id);
  * @return
  *    number of btes written
  *
- * @see id_from_str(), id_to_str(), id_is_prefix(), fprint_id()
+ * @see new_get_id_str(), id_from_str(), get_id_str(), id_is_prefix(), fprint_id()
  */
 int print_id (ident *id);
 
@@ -122,7 +153,7 @@ int print_id (ident *id);
  * @return
  *    number of btes written
  *
- * @see id_from_str(), id_to_str(), id_is_prefix(), print_id()
+ * @see new_get_id_str(), id_from_str(), get_id_str(), id_is_prefix(), print_id()
  */
 int fprint_id (FILE *F, ident *id);