c3f829c1a6
* configure.ac: Check declarations for asprintf and vasprintf. * config.in: Regenerate. * configure: Likewise. * charset.c (conversion_loop): Use XRESIZEVEC. (convert_no_conversion): Likewise. (convert_using_iconv): Likewise. (init_iconv_desc): Cast return value of alloca. (cpp_host_to_exec_charset): Use XNEWVEC. (emit_numeric_escape): Use XRESIZEVEC. (cpp_interpret_string): Use XNEWVEC. (cpp_interpret_string): Use XRESIZEVEC. (_cpp_interpret_identifier): Cast return value of alloca. (_cpp_convert_input): Use XNEWVEC and XRESIZEVEC. * directives.c (glue_header_name): Use XNEWVEC and XRESIZEVEC. (parse_include): Use XNEWVEC. (insert_pragma_entry): Rename local variable "new" to "new_entry". (save_registered_pragmas): Cast return value of xmemdup. (destringize_and_run): Same for alloca. (parse_assertion): Likewise. (do_assert): Cast allocated storage to proper type. (cpp_define): Likewise. (_cpp_define_builtin): Likewise. (cpp_undef): Likewise. (handle_assertion): Likewise. (cpp_push_buffer): Rename local variable "new" to "new_buffer". * expr.c (CPP_UPLUS): Cast value to type cpp_ttype. (CPP_UMINUS): Likewise. (struct cpp_operator): Rename from struct operator. (_cpp_expand_op_stack): Use XRESIZEVEC. * files.c (pch_open_file): Use XNEWVEC. (pch_open_file): Use XRESIZEVEC. (read_file_guts): Use XNEWVEC and XRESIZEVEC. (dir_name_of_file): Use XNEWVEC. (make_cpp_file): Use XCNEW. (make_cpp_dir): Likewise. (allocate_file_hash_entries): USE XNEWVEC. (cpp_included): Cast return value of htab_find_with_hash. (append_file_to_dir): Use XNEWVEC. (read_filename_string): Likewise. Use XRESIZEVEC too. (read_name_map): Cast return value of alloca. Use XRESIZEVEC. (remap_filename): Use XNEWVEC. (struct pchf_entry): Move definition out of struct pchf_data. (_cpp_save_file_entries): Use XCNEWVAR. (_cpp_read_file_entries): Use XNEWVAR. * identifiers.c (alloc_node): Use XOBNEW. * init.c (cpp_create_reader): Use XCNEW. (cpp_init_builtins): Cast of b->value to enum builtin_type. (read_original_directory): Cast return value of alloca. * lex.c (add_line_note): Use XRESIZEVEC. (warn_about_normalization): Use XNEWVEC. (_cpp_lex_direct): Cast node->directive_index to (enum cpp_ttype). (new_buff): Use XNEWVEC. * line-map.c (linemap_add): Use XRESIZEVEC. * macro.c (builtin_macro): Cast return value of alloca. (paste_tokens): Likewise. (expand_arg): Use XNEWVEC and XRESIZEVEC. (_cpp_save_parameter): Use XRESIZEVEC. (create_iso_definition): Cast allocated storage to proper type. (_cpp_create_definition): Likewise. (cpp_macro_definition): Use XRESIZEVEC. * makedepend.c (add_clm): Use XNEW. (add_dir): Likewise. * mkdeps.c (munge): Use XNEWVEC. (deps_init): Use XCNEW. (deps_add_target): Use XRESIZEVEC. (deps_add_default_target): Cast return value of alloca. (deps_add_dep): Use XRESIZEVEC. (deps_add_vpath): Likewise. Use XNEWVEC too. (deps_restore): Likewise. * pch.c (save_idents): Use XNEW and XNEWVEC. (cpp_save_state): Use XNEW. (count_defs): Cast return value of htab_find. (write_defs): Likewise. (cpp_write_pch_deps): Use XNEWVEC. (collect_ht_nodes): Use XRESIZEVEC. (cpp_valid_state): Use XNEWVEC. (save_macros): Use XRESIZEVEC. Cast return value of xmemdup. * symtab.c (ht_create): Use XCNEW. (ht_lookup_with_hash): Cast return value of obstack_copy0. (ht_expand): Use XCNEWVEC. * system.h (HAVE_DESIGNATED_INITIALIZERS): False if __cplusplus. (bool): Do not define if __cplusplus. From-SVN: r100295
119 lines
3.7 KiB
C
119 lines
3.7 KiB
C
/* Hash tables for the CPP library.
|
|
Copyright (C) 1986, 1987, 1989, 1992, 1993, 1994, 1995, 1996, 1998,
|
|
1999, 2000, 2001, 2002 Free Software Foundation, Inc.
|
|
Written by Per Bothner, 1994.
|
|
Based on CCCP program by Paul Rubin, June 1986
|
|
Adapted to ANSI C, Richard Stallman, Jan 1987
|
|
|
|
This program is free software; you can redistribute it and/or modify it
|
|
under the terms of the GNU General Public License as published by the
|
|
Free Software Foundation; either version 2, or (at your option) any
|
|
later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
|
|
In other words, you are welcome to use, share and improve this program.
|
|
You are forbidden to forbid anyone else to use, share and improve
|
|
what you give them. Help stamp out software-hoarding! */
|
|
|
|
#include "config.h"
|
|
#include "system.h"
|
|
#include "cpplib.h"
|
|
#include "internal.h"
|
|
|
|
static cpp_hashnode *alloc_node (hash_table *);
|
|
|
|
/* Return an identifier node for hashtable.c. Used by cpplib except
|
|
when integrated with the C front ends. */
|
|
static cpp_hashnode *
|
|
alloc_node (hash_table *table)
|
|
{
|
|
cpp_hashnode *node;
|
|
|
|
node = XOBNEW (&table->pfile->hash_ob, cpp_hashnode);
|
|
memset (node, 0, sizeof (cpp_hashnode));
|
|
return node;
|
|
}
|
|
|
|
/* Set up the identifier hash table. Use TABLE if non-null, otherwise
|
|
create our own. */
|
|
void
|
|
_cpp_init_hashtable (cpp_reader *pfile, hash_table *table)
|
|
{
|
|
struct spec_nodes *s;
|
|
|
|
if (table == NULL)
|
|
{
|
|
pfile->our_hashtable = 1;
|
|
table = ht_create (13); /* 8K (=2^13) entries. */
|
|
table->alloc_node = (hashnode (*) (hash_table *)) alloc_node;
|
|
|
|
_obstack_begin (&pfile->hash_ob, 0, 0,
|
|
(void *(*) (long)) xmalloc,
|
|
(void (*) (void *)) free);
|
|
}
|
|
|
|
table->pfile = pfile;
|
|
pfile->hash_table = table;
|
|
|
|
/* Now we can initialize things that use the hash table. */
|
|
_cpp_init_directives (pfile);
|
|
_cpp_init_internal_pragmas (pfile);
|
|
|
|
s = &pfile->spec_nodes;
|
|
s->n_defined = cpp_lookup (pfile, DSC("defined"));
|
|
s->n_true = cpp_lookup (pfile, DSC("true"));
|
|
s->n_false = cpp_lookup (pfile, DSC("false"));
|
|
s->n__VA_ARGS__ = cpp_lookup (pfile, DSC("__VA_ARGS__"));
|
|
s->n__VA_ARGS__->flags |= NODE_DIAGNOSTIC;
|
|
}
|
|
|
|
/* Tear down the identifier hash table. */
|
|
void
|
|
_cpp_destroy_hashtable (cpp_reader *pfile)
|
|
{
|
|
if (pfile->our_hashtable)
|
|
{
|
|
ht_destroy (pfile->hash_table);
|
|
obstack_free (&pfile->hash_ob, 0);
|
|
}
|
|
}
|
|
|
|
/* Returns the hash entry for the STR of length LEN, creating one
|
|
if necessary. */
|
|
cpp_hashnode *
|
|
cpp_lookup (cpp_reader *pfile, const unsigned char *str, unsigned int len)
|
|
{
|
|
/* ht_lookup cannot return NULL. */
|
|
return CPP_HASHNODE (ht_lookup (pfile->hash_table, str, len, HT_ALLOC));
|
|
}
|
|
|
|
/* Determine whether the str STR, of length LEN, is a defined macro. */
|
|
int
|
|
cpp_defined (cpp_reader *pfile, const unsigned char *str, int len)
|
|
{
|
|
cpp_hashnode *node;
|
|
|
|
node = CPP_HASHNODE (ht_lookup (pfile->hash_table, str, len, HT_NO_INSERT));
|
|
|
|
/* If it's of type NT_MACRO, it cannot be poisoned. */
|
|
return node && node->type == NT_MACRO;
|
|
}
|
|
|
|
/* For all nodes in the hashtable, callback CB with parameters PFILE,
|
|
the node, and V. */
|
|
void
|
|
cpp_forall_identifiers (cpp_reader *pfile, cpp_cb cb, void *v)
|
|
{
|
|
/* We don't need a proxy since the hash table's identifier comes
|
|
first in cpp_hashnode. */
|
|
ht_forall (pfile->hash_table, (ht_cb) cb, v);
|
|
}
|