Made xmalloc.h C++ compatible

[libfirm] / include / libfirm / ident.h

diff --git a/include/libfirm/ident.h b/include/libfirm/ident.h
index b2a0f6e..a4b88ee 100644 (file)
--- a/include/libfirm/ident.h
+++ b/include/libfirm/ident.h
@@ -30,13 +30,8 @@
 #ifndef FIRM_IDENT_IDENT_H
 #define FIRM_IDENT_IDENT_H
 
-#include "firm_config.h"
 #include "firm_types.h"
 
-#ifdef FIRM_ENABLE_WCHAR
-#include <wchar.h>
-#endif
-
 /* Identifiers */
 
 /**
@@ -81,44 +76,6 @@ typedef struct _ident_if_t {
    * Finish the ident module and frees all idents, may be NULL.
    */
   void (*finish_ident)(void *handle);
-
-#ifdef FIRM_ENABLE_WCHAR
-  /**
-   * Store a wide character string and create an ident.
-   * This function may be NULL, new_id_from_wchars()
-   * is then used to emulate it's behavior.
-   *
-   * @param wstr - the string which shall be stored
-   */
-  ident *(*new_id_from_wcs)(void *handle, const wchar_t *wstr);
-
-  /**
-   * Store a wide character string and create an ident.
-   * This function may be NULL, new_id_from_chars() is then used appropriate.
-   * Beware: the string might not be stored at a right alignment!
-   *
-   * @param wstr - the wide character string which shall be stored
-   * @param len  - the length of the string
-   */
-  ident *(*new_id_from_wchars)(void *handle, const wchar_t *wstr, int len);
-
-  /**
-   * Returns a wide character string represented by an ident.
-   * This function may be NULL, get_id_str() is then used.
-   * This assume that the strings are stored at an address aligned
-   * for wchar_t, so beware!
-   */
-  const wchar_t *(*get_id_wcs)(void *handle, ident *id);
-
-  /**
-   * Returns the length of the string represented by an ident.
-   * This function may be NULL, get_id_wcs() is then used
-   * to emulate it's behavior.
-   *
-   * @param id - the ident
-   */
-  int  (*get_id_wcslen)(void *handle, ident *id);
-#endif
 } ident_if_t;
 
 /**
@@ -221,73 +178,6 @@ int id_contains_char (ident *id, char c);
  */
 ident *id_unique(const char *tag);
 
-#ifdef FIRM_ENABLE_WCHAR
-/**
- *  Store a wide character string and create an ident.
- *
- *  Stores a string in the ident module and returns a handle for the string.
- *
- *  Copies the string. @p str must be zero terminated
- *
- * @param str - the wide character string which shall be stored
- *
- * @return id - a handle for the generated ident
- *
- * @see get_id_wcs(), get_id_wcs()
- */
-ident *new_id_from_wcs (const wchar_t *str);
-
-/** Store a wide character string and create an ident.
- *
- * Stores a string in the ident module and returns a handle for the string.
- * Copies the string. This version takes non-zero-terminated strings.
- *
- * @param wstr - the wide character string (or whatever) which shall be stored
- * @param len  - the length of string
- *
- * @return id - a handle for the generated ident
- *
- * @see new_id_from_str(), get_id_strlen()
- */
-ident *new_id_from_wchars (const wchar_t *str, int len);
-
-/**
- * Returns a wide character string represented by an ident.
- *
- * Returns the string represented by id. This string is
- * NULL terminated. The string may not be changed.
- *
- * @param id - the ident
- *
- * @return cp - a string
- *
- * @see new_id_from_wcs(), new_id_from_wchars(), get_id_wcslen()
- */
-const wchar_t *get_id_wcs(ident *id);
-
-/**
- * Returns the length of the wide character string represented by an ident.
- *
- * @param id - the ident
- *
- * @return len - the length of the string
- *
- * @see new_id_from_wcs(), new_id_from_wchars(), get_id_wcs()
- */
-int  get_id_wcslen(ident *id);
-
-/**
- * Return true if an ident contains a given character.
- *
- * @param id     - the ident
- * @param c      - the character
- *
- * @see new_id_from_wcs(), new_id_from_chars(), get_id_str()
- */
-int id_contains_wchar (ident *id, wchar_t c);
-
-#endif /* FIRM_ENABLE_WCHAR */
-
 /** initializes the name mangling code */
 void   firm_init_mangle (void);
 
@@ -305,6 +195,9 @@ ident *mangle_dot (ident *first, ident* scnd);
 /** mangle: Returns a new ident that represents firstscnd. */
 ident *mangle   (ident *first, ident* scnd);
 
+/** Returns a new ident that represents 'prefixscndsuffix'. */
+ident *mangle3 (const char *prefix, ident *middle, const char *suffix);
+
 /** returns a mangled name for a Win32 function using it's calling convention */
 ident *decorate_win32_c_fkt(ir_entity *ent, ident *id);