diff options
| author | Zack Weinberg <zack@gcc.gnu.org> | 2000-05-01 18:20:10 +0000 |
|---|---|---|
| committer | Zack Weinberg <zack@gcc.gnu.org> | 2000-05-01 18:20:10 +0000 |
| commit | a7abcbbf92b21842d774a96fae56122c95544f44 (patch) | |
| tree | f86e627be1bd97d95d7ce2354cf47e7860868588 /gcc/cpplex.c | |
| parent | b7fe530c1e209f8f7588ce369bae21725346a662 (diff) | |
| download | gcc-a7abcbbf92b21842d774a96fae56122c95544f44.zip gcc-a7abcbbf92b21842d774a96fae56122c95544f44.tar.gz gcc-a7abcbbf92b21842d774a96fae56122c95544f44.tar.bz2 | |
cpphash.c (_cpp_make_hashnode): Rename make_HASHNODE, now static.
* cpphash.c (_cpp_make_hashnode): Rename make_HASHNODE, now
static. Allocate the hashnode and its string in the same
block of memory.
(del_HASHNODE): Don't free h->name.
(_cpp_lookup): If there is no entry for this string, create
one, of type T_VOID.
(_cpp_lookup_slot): Delete.
* cpphash.h: Update prototypes.
* cpplex.c (maybe_macroexpand): Check for hp->type == T_VOID,
not hp == NULL.
* cpplib.c (do_define, do_undef, do_pragma_poison, do_assert,
do_unassert, cpp_defined): Use _cpp_lookup. Don't create a
node here, just fill in the value field properly. "Delete"
entries by setting the value field to T_VOID. Check for
hp->type == T_VOID, not hp == NULL.
* Makefile.in (cpplib.o): Don't depend on $(HASHTAB_H).
* cpperror.c, cppexp.c, cpplex.c, cpplib.c: Don't include
hashtab.h.
From-SVN: r33581
Diffstat (limited to 'gcc/cpplex.c')
| -rw-r--r-- | gcc/cpplex.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/cpplex.c b/gcc/cpplex.c index 59d9665..3feacd2 100644 --- a/gcc/cpplex.c +++ b/gcc/cpplex.c @@ -23,7 +23,6 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "config.h" #include "system.h" #include "intl.h" -#include "hashtab.h" #include "cpplib.h" #include "cpphash.h" @@ -1463,7 +1462,8 @@ maybe_macroexpand (pfile, written) size_t len = CPP_WRITTEN (pfile) - written; HASHNODE *hp = _cpp_lookup (pfile, macro, len); - if (!hp) + /* _cpp_lookup never returns null. */ + if (hp->type == T_VOID) return 0; if (hp->disabled || hp->type == T_IDENTITY) { |