7061aa5a9e
1998-12-15 Zack Weinberg <zack@rabi.phys.columbia.edu>
* cpphash.h (union hash_value): Remove `keydef' member, add a
`struct hashnode *aschain' member for #assert.
* cpplib.c (struct tokenlist_list, struct
assertion_hashnode): Delete structure definitions.
(assertion_install, assertion_lookup, delete_assertion,
check_assertion, compare_token_lists, reverse_token_list,
read_token_list, free_token_list): Delete functions.
(parse_assertion): New function.
(cpp_cleanup): Don't destroy the assertion_hashtable.
(do_assert): Gut and rewrite. #assert foo (bar) places
entries for `#foo' and `#foo(bar)' in the macro hash table,
type T_ASSERT. The value union's `aschain' member is used
to chain all answers for a given predicate together.
(do_unassert): Also rewritten. Take an un-asserted
answer off the chain from its predicate and call
delete_macro on the hashnode, or walk a predicate chain
calling delete_macro on all the entries.
(cpp_read_check_assertion): Simply call parse_assertion to
get the canonical assertion name, and look that up in the
hash table.
* cpplib.h (ASSERTION_HASHNODE,ASSERTION_HASHSIZE,assertion_hashtab):
Removed.
* cpphash.c (install): Use bcopy instead of an explicit loop
to copy the macro name.
* cppexp.c (cpp_lex): Convert the result of
cpp_read_check_assertion to a `struct operation' directly;
don't go through parse_number.
From-SVN: r24325
38 lines
1.4 KiB
C
38 lines
1.4 KiB
C
/* different kinds of things that can appear in the value field
|
|
of a hash node. Actually, this may be useless now. */
|
|
union hashval {
|
|
int ival;
|
|
char *cpval;
|
|
DEFINITION *defn;
|
|
struct hashnode *aschain; /* for #assert */
|
|
};
|
|
|
|
struct hashnode {
|
|
struct hashnode *next; /* double links for easy deletion */
|
|
struct hashnode *prev;
|
|
struct hashnode **bucket_hdr; /* also, a back pointer to this node's hash
|
|
chain is kept, in case the node is the head
|
|
of the chain and gets deleted. */
|
|
enum node_type type; /* type of special token */
|
|
int length; /* length of token, for quick comparison */
|
|
U_CHAR *name; /* the actual name */
|
|
union hashval value; /* pointer to expansion, or whatever */
|
|
};
|
|
|
|
typedef struct hashnode HASHNODE;
|
|
|
|
/* Some definitions for the hash table. The hash function MUST be
|
|
computed as shown in hashf () below. That is because the rescan
|
|
loop computes the hash value `on the fly' for most tokens,
|
|
in order to avoid the overhead of a lot of procedure calls to
|
|
the hashf () function. Hashf () only exists for the sake of
|
|
politeness, for use when speed isn't so important. */
|
|
|
|
#define HASHSIZE 1403
|
|
#define HASHSTEP(old, c) ((old << 2) + c)
|
|
#define MAKE_POS(v) (v & 0x7fffffff) /* make number positive */
|
|
|
|
extern HASHNODE *install PARAMS ((U_CHAR *,int,enum node_type, int,char *,int));
|
|
extern int hashf PARAMS ((const U_CHAR *, int, int));
|
|
extern void delete_macro PARAMS ((HASHNODE *));
|