X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fident%2Fident.c;h=38e37a4f76665c8b20655e61c03781e93fcc400d;hb=8539c297741e52830095f028c07607c1e89f0a7e;hp=47838da79d691e2a6a6c61ac42cd671928858e99;hpb=bc79a622b9bb6d5802fd836f1af697a35f70963f;p=libfirm diff --git a/ir/ident/ident.c b/ir/ident/ident.c index 47838da79..38e37a4f7 100644 --- a/ir/ident/ident.c +++ b/ir/ident/ident.c @@ -23,9 +23,7 @@ * @author Goetz Lindenmaier * @version $Id$ */ -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#include "config.h" #include #include @@ -34,10 +32,6 @@ #include #include -#ifdef FIRM_ENABLE_WCHAR -#include -#endif - #include "ident_t.h" #include "set.h" #include "xmalloc.h" @@ -82,7 +76,7 @@ static ident *set_new_id_from_chars(void *handle, const char *str, int len) static ident *set_new_id_from_str(void *handle, const char *str) { assert(str); - return (ident *)set_new_id_from_chars(handle, str, strlen(str)); + return set_new_id_from_chars(handle, str, strlen(str)); } /** @@ -142,111 +136,6 @@ static int def_get_id_strlen(void *handle, ident *id) return strlen(impl.get_id_str(handle, id)); } -#ifdef FIRM_ENABLE_WCHAR -/** - * Stores a wide character string in the ident module and returns a - * handle for the string. - * - * @param handle the handle for the set - * @param wstr the wide character string which shall be stored - * @param len length of wstr - * - * @return id - a handle for the generated ident - * - * Default implementation using libfirm sets. - */ -static ident *set_new_id_from_wchars(void *handle, const wchar_t *wstr, int len) -{ - set *id_set = handle; - wchar_t *tmp; - - /* can't use hinsert0 here, so copy and add a 0 */ - tmp = alloca((len + 1) * sizeof(*tmp)); - memcpy(tmp, wstr, len * sizeof(*tmp)); - tmp[len] = L'\0'; - - return (ident *)set_hinsert(id_set, tmp, (len + 1) * sizeof(wchar_t), ID_HASH(wchar_t, tmp, len)); -} - -/** - * Stores a wide character string in the ident module and - * returns a handle for the string. - * - * @param handle the handle for the set - * @param wstr the wide character string which shall be stored - * - * Default implementation using libfirm sets. - */ -static ident *set_new_id_from_wcs(void *handle, const wchar_t *wstr) -{ - assert(wstr); - return (ident *)set_new_id_from_wchars(handle, wstr, wcslen(wstr)); -} - -/** - * Returns a wide character string represented by an ident. - * - * @param handle the handle for the set - * @param id the ident - * - * Default implementation using libfirm sets. - */ -static const wchar_t *set_get_id_wcs(void *handle, ident *id) -{ - struct set_entry *entry = (struct set_entry *)id; - - return (const wchar_t *)entry->dptr; -} - -/** - * Returns the length of the string represented by an ident. - * - * @param handle the handle for the set - * @param id the ident - * - * Default implementation using libfirm sets. - */ -static int set_get_id_wcslen(void *handle, ident *id) -{ - struct set_entry *entry = (struct set_entry *)id; - - /* len + \0 is stored for wchar_t */ - return entry->size / sizeof(wchar_t) - 1; -} - -/** - * Default implementation if no new_id_from_wcs() is provided. - */ -static ident *def_new_id_from_wcs(void *handle, const wchar_t *wstr) -{ - return impl.new_id_from_wchars(handle, wstr, wcslen(wstr)); -} - -/** - * Default implementation if no new_id_from_wchars() is provided. - */ -static ident *def_new_id_from_wchars(void *handle, const wchar_t *wstr, int len) -{ - return impl.new_id_from_chars(handle, (const char *)wstr, (len + 1) * sizeof(wchar_t)); -} - -/** - * Default implementation if no get_id_wcs() is provided. - */ -static const wchar_t *def_get_id_wcs(void *handle, ident *id) -{ - return (const wchar_t *)impl.get_id_str(handle, id); -} - -/** - * Default implementation if no get_id_wcslen() is provided. - */ -static int def_get_id_wcslen(void *handle, ident *id) -{ - return wcslen(impl.get_id_wcs(handle, id)); -} -#endif /* FIRM_ENABLE_WCHAR */ - /* Initialize the ident module. */ void init_ident(ident_if_t *id_if, int initial_n_idents) { @@ -257,30 +146,12 @@ void init_ident(ident_if_t *id_if, int initial_n_idents) impl.new_id_from_str = def_new_id_from_str; if (! impl.get_id_strlen) impl.get_id_strlen = def_get_id_strlen; - -#ifdef FIRM_ENABLE_WCHAR - if (! impl.new_id_from_wcs) - impl.new_id_from_wcs = def_new_id_from_wcs; - if (! impl.new_id_from_wchars) - impl.new_id_from_wchars = def_new_id_from_wchars; - if (! impl.get_id_wcs) - impl.get_id_wcs = def_get_id_wcs; - if (! impl.get_id_wcslen) - impl.get_id_wcslen = def_get_id_wcslen; -#endif /* FIRM_ENABLE_WCHAR */ - } - else { + } else { impl.new_id_from_str = set_new_id_from_str; impl.new_id_from_chars = set_new_id_from_chars; impl.get_id_str = set_get_id_str; impl.get_id_strlen = set_get_id_strlen; impl.finish_ident = set_finish_ident; -#ifdef FIRM_ENABLE_WCHAR - impl.new_id_from_wcs = set_new_id_from_wcs; - impl.new_id_from_wchars = set_new_id_from_wchars; - impl.get_id_wcs = set_get_id_wcs; - impl.get_id_wcslen = set_get_id_wcslen; -#endif /* FIRM_ENABLE_WCHAR */ /* it's ok to use memcmp here, we check only strings */ impl.handle = new_set(memcmp, initial_n_idents); @@ -348,34 +219,3 @@ ident *id_unique(const char *tag) unique_id++; return new_id_from_str(buf); } - -#ifdef FIRM_ENABLE_WCHAR - -ident *new_id_from_wcs (const wchar_t *str) -{ - assert(str); - return impl.new_id_from_wcs(impl.handle, str); -} - -ident *new_id_from_wchars (const wchar_t *str, int len) -{ - assert(len > 0); - return impl.new_id_from_wchars(impl.handle, str, len); -} - -const wchar_t *get_id_wcs(ident *id) -{ - return impl.get_id_wcs(impl.handle, id); -} - -int get_id_wcslen(ident *id) -{ - return impl.get_id_wcslen(impl.handle, id); -} - -int id_contains_wchar (ident *id, wchar_t c) -{ - return wcschr(get_id_wcs(id), c) != NULL; -} - -#endif /* FIRM_ENABLE_WCHAR */