* cppexp.c (lex): Use NODE_NAME and NODE_LEN.

	* cpphash.c (_cpp_lookup_with_hash): Similarly.
	* cpplex.c (cpp_ideq, parse_identifier, cpp_token_len,
	cpp_spell_token, cpp_output_token): Similarly.
	* cpplib.c (lex_macro_node, do_undef, do_pragma,
	do_pragma_poison, parse_assertion, do_assert): Similarly.
	* cppmacro.c (builtin_macro, parse_args, funlike_invocation_p,
	save_parameter, _cpp_create_definition, check_trad_stringification,
	cpp_macro_definition): Similarly.
	* cppmain.c (cb_define, cb_undef, dump_macro): Similarly.
	* c-lex.c (cb_undef, c_lex): Similarly.
	* fix-header.c (recognized_function): Similarly.
	* cpplib.h (NODE_LEN, NODE_NAME): New.
	(cpp_hashnode): Rename length len.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@42174 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 6 insertions, 6 deletions

diff --git a/gcc/cpphash.c b/gcc/cpphash.c
index d4c9e376dd9..a47a635c630 100644
--- a/gcc/cpphash.c
+++ b/gcc/cpphash.c
@@ -136,8 +136,8 @@ _cpp_lookup_with_hash (pfile, len, hash)
     {
       unsigned int hash2;
 
-      if (entry->hash == hash && entry->length == len
-	  && !memcmp (entry->name, name, len))
+      if (entry->hash == hash && NODE_LEN (entry) == len
+	  && !memcmp (NODE_NAME (entry), name, len))
 	return entry;
 
       hash2 = 1 + hash % (size - 2);
@@ -151,8 +151,8 @@ _cpp_lookup_with_hash (pfile, len, hash)
 
 	  if (entry == NULL)
 	    break;
-	  if (entry->hash == hash && entry->length == len
-	      && !memcmp (entry->name, name, len))
+	  if (entry->hash == hash && NODE_LEN (entry) == len
+	      && !memcmp (NODE_NAME (entry), name, len))
 	    return entry;
 	}
     }
@@ -168,9 +168,9 @@ _cpp_lookup_with_hash (pfile, len, hash)
   entry->flags = 0;
   entry->directive_index = 0;
   entry->arg_index = 0;
-  entry->length = len;
+  NODE_LEN (entry) = len;
   entry->hash = hash;
-  entry->name = name;
+  NODE_NAME (entry) = name;
   entry->value.macro = 0;
 
   pfile->hashtab->nelts++;