diff options
| author | Richard Kenner <kenner@vlsi1.ultra.nyu.edu> | 2000-04-18 20:42:00 +0000 |
|---|---|---|
| committer | Richard Kenner <kenner@gcc.gnu.org> | 2000-04-18 16:42:00 -0400 |
| commit | e38992e8d312b679eb3f4b9973567805a96511cb (patch) | |
| tree | 83c55501d7538240d73d1cd61690beae93dbce4b /gcc/cpplib.c | |
| parent | 0d9eb3ba2922a07d68c27170de0195f5b96b4b0c (diff) | |
| download | gcc-e38992e8d312b679eb3f4b9973567805a96511cb.zip gcc-e38992e8d312b679eb3f4b9973567805a96511cb.tar.gz gcc-e38992e8d312b679eb3f4b9973567805a96511cb.tar.bz2 | |
conflict.c (conflict_graph_add): Pass enum type to htab_find_slot.
* gcc/conflict.c (conflict_graph_add): Pass enum type to
htab_find_slot.
* gcc/cpperror.c (hashtab.h): Now include.
* gcc/cppexp.c (hashtab.h): Likewise.
* gcc/cpplex.c (hashtab.h): Likewise.
* gcc/cppfiles.c (hashtab.h): Likewise.
(find_include_file, _cpp_calc_hash, cpp_read_file): Pass enum type
to htab_find_slot_with_hash.
* gcc/cpphash.c (hashtab.h): Now include.
(_cpp_lookup_slot): INSERT is now enum insert_option.
* gcc/cpphash.h (_cpp_lookup_slot): Likewise.
* gcc/cppinit.c (hashtab.h): Include earlier.
(initialize_builtins): Pass enum to htab_find_slot.
* gcc/cpplib.c (hashtab.h): Now include.
(do_define, do_undef): Pass enum type to _cpp_lookup_slot.
(do_pragma_poison, do_assert): Likewise.
* gcc/emit-rtl.c (gen_rtx_CONST_INT): Pass enum to
htab_find_slot_with_hash.
* gcc/simplify-rtx.c (cselib_lookup_mem, cselib_lookup): Likewise.
* gcc/tree.c (type_hash_add): Likewise.
(build1): Minor cleanup.
* include/hashtab.h (enum insert_option): New type.
(htab_find_slot, htab_find_slot_with_hash): Use it.
* libiberty/hashtab.c: Various minor cleanups.
(htab_find_slot_with_hash): INSERT is now enum insert_option.
(htab_find_slot): Likewise.
From-SVN: r33236
Diffstat (limited to 'gcc/cpplib.c')
| -rw-r--r-- | gcc/cpplib.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gcc/cpplib.c b/gcc/cpplib.c index 44cc189..87f245c 100644 --- a/gcc/cpplib.c +++ b/gcc/cpplib.c @@ -22,6 +22,7 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "config.h" #include "system.h" +#include "hashtab.h" #include "cpplib.h" #include "cpphash.h" #include "hashtab.h" @@ -392,7 +393,7 @@ do_define (pfile) goto out; } - slot = _cpp_lookup_slot (pfile, sym, len, 1, &hash); + slot = _cpp_lookup_slot (pfile, sym, len, INSERT, &hash); if (*slot) { int ok; @@ -770,7 +771,7 @@ do_undef (pfile) name = pfile->token_buffer + here; CPP_SET_WRITTEN (pfile, here); - slot = _cpp_lookup_slot (pfile, name, len, 0, 0); + slot = _cpp_lookup_slot (pfile, name, len, NO_INSERT, 0); if (slot) { HASHNODE *hp = *slot; @@ -1028,7 +1029,7 @@ do_pragma_poison (pfile) p = pfile->token_buffer + written; len = strlen (p); - slot = _cpp_lookup_slot (pfile, p, len, 1, &hash); + slot = _cpp_lookup_slot (pfile, p, len, INSERT, &hash); if (*slot) { HASHNODE *hp = *slot; @@ -1586,14 +1587,14 @@ do_assert (pfile) sym = pfile->token_buffer + old_written; blen = (U_CHAR *) strchr (sym, '(') - sym; - tslot = _cpp_lookup_slot (pfile, sym, tlen, 1, &thash); + tslot = _cpp_lookup_slot (pfile, sym, tlen, INSERT, &thash); if (*tslot) { cpp_warning (pfile, "%s re-asserted", sym); goto error; } - bslot = _cpp_lookup_slot (pfile, sym, blen, 1, &bhash); + bslot = _cpp_lookup_slot (pfile, sym, blen, INSERT, &bhash); if (! *bslot) { *bslot = base = _cpp_make_hashnode (sym, blen, T_ASSERT, bhash); |