cpphash.h: Move struct reflist, struct definition, and the DEFINITION typedef to cpphash.c.

	* cpphash.h: Move struct reflist, struct definition, and the
	DEFINITION typedef to cpphash.c.  Use 'struct definition *' in
	union hashval.  _cpp_free_definition takes a HASHNODE pointer.
	* cpphash.c (_cpp_free_definition): Free data pointed to by
	MCONST, XCONST, MACRO, and FMACRO nodes properly.
	(_cpp_create_definition, del_HASHNODE): Just call
	_cpp_free_definition to clear out a hashnode.
	* cpplib.c (do_pragma_poison): Likewise.

From-SVN: r33536

4 files changed, 83 insertions, 75 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c99c2f2..6925343 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+2000-04-29  Zack Weinberg  <zack@wolery.cumb.org>
+
+	* cpphash.h: Move struct reflist, struct definition, and the
+	DEFINITION typedef to cpphash.c.  Use 'struct definition *' in
+	union hashval.  _cpp_free_definition takes a HASHNODE pointer.
+	* cpphash.c (_cpp_free_definition): Free data pointed to by
+	MCONST, XCONST, MACRO, and FMACRO nodes properly.
+	(_cpp_create_definition, del_HASHNODE): Just call
+	_cpp_free_definition to clear out a hashnode.
+	* cpplib.c (do_pragma_poison): Likewise.
+
 Sat Apr 29 12:25:17 2000  Alexandre Oliva  <aoliva@cygnus.com>
 
 	* config/mn10300/mn10300.h (FIRST_DATA_REGNUM,
diff --git a/gcc/cpphash.c b/gcc/cpphash.c
index fe594a2..0cb8ff6 100644
--- a/gcc/cpphash.c
+++ b/gcc/cpphash.c
@@ -31,6 +31,55 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 #undef abort
 
+/* Structure allocated for every #define.  For a simple replacement
+   such as
+   	#define foo bar ,
+   nargs = -1, the `pattern' list is null, and the expansion is just
+   the replacement text.  Nargs = 0 means a functionlike macro with no args,
+   e.g.,
+       #define getchar() getc (stdin) .
+   When there are args, the expansion is the replacement text with the
+   args squashed out, and the reflist is a list describing how to
+   build the output from the input: e.g., "3 chars, then the 1st arg,
+   then 9 chars, then the 3rd arg, then 0 chars, then the 2nd arg".
+   The chars here come from the expansion.  Whatever is left of the
+   expansion after the last arg-occurrence is copied after that arg.
+   Note that the reflist can be arbitrarily long---
+   its length depends on the number of times the arguments appear in
+   the replacement text, not how many args there are.  Example:
+   #define f(x) x+x+x+x+x+x+x would have replacement text "++++++" and
+   pattern list
+     { (0, 1), (1, 1), (1, 1), ..., (1, 1), NULL }
+   where (x, y) means (nchars, argno). */
+
+struct reflist
+{
+  struct reflist *next;
+  char stringify;		/* nonzero if this arg was preceded by a
+				   # operator. */
+  char raw_before;		/* Nonzero if a ## operator before arg. */
+  char raw_after;		/* Nonzero if a ## operator after arg. */
+  char rest_args;		/* Nonzero if this arg. absorbs the rest */
+  int nchars;			/* Number of literal chars to copy before
+				   this arg occurrence.  */
+  int argno;			/* Number of arg to substitute (origin-0) */
+};
+
+typedef struct definition DEFINITION;
+struct definition
+{
+  int nargs;
+  int length;			/* length of expansion string */
+  U_CHAR *expansion;
+  char rest_args;		/* Nonzero if last arg. absorbs the rest */
+  struct reflist *pattern;
+
+  /* Names of macro args, concatenated in order with \0 between
+     them.  The only use of this is that we warn on redefinition if
+     this differs between the old and new definitions.  */
+  U_CHAR *argnames;
+};
+
 static unsigned int hash_HASHNODE PARAMS ((const void *));
 static int eq_HASHNODE		  PARAMS ((const void *, const void *));
 static void del_HASHNODE	  PARAMS ((void *));
@@ -160,11 +209,8 @@ del_HASHNODE (x)
      void *x;
 {
   HASHNODE *h = (HASHNODE *)x;
-  
-  if (h->type == T_MACRO)
-    _cpp_free_definition (h->value.defn);
-  else if (h->type == T_MCONST)
-    free ((void *) h->value.cpval);
+
+  _cpp_free_definition (h);
   free ((void *) h->name);
   free (h);
 }
@@ -266,23 +312,28 @@ _cpp_init_macro_hash (pfile)
 				eq_HASHNODE, del_HASHNODE);
 }
 
-/* Free a DEFINITION structure.  Used by delete_macro, and by
-   do_define when redefining macros.  */
+/* Free the definition of macro H.  */
 
 void
-_cpp_free_definition (d)
-     DEFINITION *d;
+_cpp_free_definition (h)
+     HASHNODE *h;
 {
-  struct reflist *ap, *nextap;
-
-  for (ap = d->pattern; ap != NULL; ap = nextap)
+  if (h->type == T_MCONST || h->type == T_XCONST)
+    free ((void *) h->value.cpval);
+  else if (h->type == T_MACRO || h->type == T_FMACRO)
     {
-      nextap = ap->next;
-      free (ap);
+      DEFINITION *d = h->value.defn;
+      struct reflist *ap, *nextap;
+    
+      for (ap = d->pattern; ap != NULL; ap = nextap)
+	{
+	  nextap = ap->next;
+	  free (ap);
+	}
+      if (d->argnames)
+	free (d->argnames);
+      free (d);
     }
-  if (d->argnames)
-    free (d->argnames);
-  free (d);
 }
 
 static int
@@ -934,10 +985,7 @@ _cpp_create_definition (pfile, list, hp)
 
   /* And replace the old definition (if any).  */
 
-  if (hp->type == T_MACRO || hp->type == T_FMACRO)
-    _cpp_free_definition (hp->value.defn);
-  else if (hp->type == T_MCONST || hp->type == T_XCONST)
-    free ((PTR) hp->value.cpval);
+  _cpp_free_definition (hp);
 
   if (ntype == T_MACRO || ntype == T_FMACRO)
     hp->value.defn = defn;
diff --git a/gcc/cpphash.h b/gcc/cpphash.h
index 2d2ea8d..498dee5 100644
--- a/gcc/cpphash.h
+++ b/gcc/cpphash.h
@@ -24,55 +24,6 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 typedef unsigned char U_CHAR;
 
-/* Structure allocated for every #define.  For a simple replacement
-   such as
-   	#define foo bar ,
-   nargs = -1, the `pattern' list is null, and the expansion is just
-   the replacement text.  Nargs = 0 means a functionlike macro with no args,
-   e.g.,
-       #define getchar() getc (stdin) .
-   When there are args, the expansion is the replacement text with the
-   args squashed out, and the reflist is a list describing how to
-   build the output from the input: e.g., "3 chars, then the 1st arg,
-   then 9 chars, then the 3rd arg, then 0 chars, then the 2nd arg".
-   The chars here come from the expansion.  Whatever is left of the
-   expansion after the last arg-occurrence is copied after that arg.
-   Note that the reflist can be arbitrarily long---
-   its length depends on the number of times the arguments appear in
-   the replacement text, not how many args there are.  Example:
-   #define f(x) x+x+x+x+x+x+x would have replacement text "++++++" and
-   pattern list
-     { (0, 1), (1, 1), (1, 1), ..., (1, 1), NULL }
-   where (x, y) means (nchars, argno). */
-
-struct reflist
-{
-  struct reflist *next;
-  char stringify;		/* nonzero if this arg was preceded by a
-				   # operator. */
-  char raw_before;		/* Nonzero if a ## operator before arg. */
-  char raw_after;		/* Nonzero if a ## operator after arg. */
-  char rest_args;		/* Nonzero if this arg. absorbs the rest */
-  int nchars;			/* Number of literal chars to copy before
-				   this arg occurrence.  */
-  int argno;			/* Number of arg to substitute (origin-0) */
-};
-
-typedef struct definition DEFINITION;
-struct definition
-{
-  int nargs;
-  int length;			/* length of expansion string */
-  U_CHAR *expansion;
-  char rest_args;		/* Nonzero if last arg. absorbs the rest */
-  struct reflist *pattern;
-
-  /* Names of macro args, concatenated in order with \0 between
-     them.  The only use of this is that we warn on redefinition if
-     this differs between the old and new definitions.  */
-  U_CHAR *argnames;
-};
-
 /* The structure of a node in the hash table.  The hash table
    has entries for all tokens defined by #define commands (type T_MACRO),
    plus some special tokens like __LINE__ (these each have their own
@@ -106,7 +57,7 @@ enum node_type
 union hashval
 {
   const char *cpval;		/* some predefined macros */
-  DEFINITION *defn;		/* #define */
+  struct definition *defn;	/* #define */
   struct hashnode *aschain;	/* #assert */
 };
 
@@ -276,7 +227,7 @@ extern HASHNODE **_cpp_lookup_slot	PARAMS ((cpp_reader *,
 						 const U_CHAR *, int,
 						 enum insert_option,
 						 unsigned long *));
-extern void _cpp_free_definition	PARAMS ((DEFINITION *));
+extern void _cpp_free_definition	PARAMS ((HASHNODE *));
 extern int _cpp_create_definition	PARAMS ((cpp_reader *,
 						 cpp_toklist *, HASHNODE *));
 extern void _cpp_dump_definition	PARAMS ((cpp_reader *, HASHNODE *));
diff --git a/gcc/cpplib.c b/gcc/cpplib.c
index 2d466ff..384f5fb 100644
--- a/gcc/cpplib.c
+++ b/gcc/cpplib.c
@@ -980,9 +980,7 @@ do_pragma_poison (pfile)
 	  if (hp->type != T_POISON)
 	    {
 	      cpp_warning (pfile, "poisoning existing macro `%s'", hp->name);
-	      if (hp->type == T_MACRO)
-		_cpp_free_definition (hp->value.defn);
-	      hp->value.defn = 0;
+	      _cpp_free_definition (hp);
 	      hp->type = T_POISON;
 	    }
 	}