d8044160b7
2004-06-09 Geoffrey Keating <geoffk@apple.com> * Makefile.in (CPPLIB_H): Put files in order of inclusion. (CPP_ID_DATA_H): New. (gtype-desc.o): Update dependencies. (GTFILES): Use CPP_ID_DATA_H. Index: gcc/testsuite/ChangeLog 2004-06-09 Geoffrey Keating <geoffk@apple.com> * gcc.dg/pch/macro-4.c: New. * gcc.dg/pch/macro-4.hs: New. Index: libcpp/ChangeLog 2004-06-09 Geoffrey Keating <geoffk@apple.com> * traditional.c (push_replacement_text): Set macro->traditional. (save_replacement_text): Likewise. * pch.c (cpp_write_pch_state): Don't write list of defined macros. (struct save_macro_item): Delete. (struct save_macro_data): Use a character array not the previous structured format. (save_macros): Save macro as text not as internal structures. (cpp_prepare_state): Update for changes to save_macro_data. (cpp_read_state): Don't read macros defined in PCH. Restore -D macros as text. * macro.c (create_iso_definition): Honour alloc_subobject. Clear traditional flag. (_cpp_create_definition): Honour alloc_subobject. * lex.c (cpp_token_val_index): New. * internal.h: Include cpp-id-data.h. (uchar): Move definition to cpp-id-data.h. (U): Likewise. (cpp_macro): Likewise. * directives.c (struct answer): Move to cpp-id-data.h. (do_assert): Honour alloc_subobject. Index: libcpp/include/ChangeLog 2004-06-09 Geoffrey Keating <geoffk@apple.com> * symtab.h (struct ht): Add field 'alloc_subobject'. * cpplib.h (struct cpp_string): Add GTY marker. (enum cpp_token_fld_kind): New. (struct cpp_token): Add GTY markers. (cpp_token_val_index): Prototype. (CPP_HASHNODE_VALUE_IDX): New. (struct cpp_hashnode): Don't skip fields of 'value' when marking. * cpp-id-data.h: New file. From-SVN: r82851
78 lines
2.4 KiB
C
78 lines
2.4 KiB
C
/* Structures that hang off cpp_identifier, for PCH.
|
|
Copyright (C) 1986, 1987, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
|
|
1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
|
|
|
|
This program is free software; you can redistribute it and/or modify it
|
|
under the terms of the GNU General Public License as published by the
|
|
Free Software Foundation; either version 2, or (at your option) any
|
|
later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
|
|
|
|
#include "cpplib.h"
|
|
|
|
#ifndef HAVE_UCHAR
|
|
typedef unsigned char uchar;
|
|
#endif
|
|
#define U (const uchar *) /* Intended use: U"string" */
|
|
|
|
/* Chained list of answers to an assertion. */
|
|
struct answer GTY(())
|
|
{
|
|
struct answer *next;
|
|
unsigned int count;
|
|
cpp_token GTY ((length ("%h.count"))) first[1];
|
|
};
|
|
|
|
/* Each macro definition is recorded in a cpp_macro structure.
|
|
Variadic macros cannot occur with traditional cpp. */
|
|
struct cpp_macro GTY(())
|
|
{
|
|
/* Parameters, if any. */
|
|
cpp_hashnode ** GTY ((nested_ptr (union tree_node,
|
|
"%h ? CPP_HASHNODE (GCC_IDENT_TO_HT_IDENT (%h)) : NULL",
|
|
"%h ? HT_IDENT_TO_GCC_IDENT (HT_NODE (%h)) : NULL"),
|
|
length ("%h.paramc")))
|
|
params;
|
|
|
|
/* Replacement tokens (ISO) or replacement text (traditional). See
|
|
comment at top of cpptrad.c for how traditional function-like
|
|
macros are encoded. */
|
|
union cpp_macro_u
|
|
{
|
|
cpp_token * GTY ((tag ("0"), length ("%0.count"))) tokens;
|
|
const uchar * GTY ((tag ("1"))) text;
|
|
} GTY ((desc ("%1.traditional"))) exp;
|
|
|
|
/* Definition line number. */
|
|
source_location line;
|
|
|
|
/* Number of tokens in expansion, or bytes for traditional macros. */
|
|
unsigned int count;
|
|
|
|
/* Number of parameters. */
|
|
unsigned short paramc;
|
|
|
|
/* If a function-like macro. */
|
|
unsigned int fun_like : 1;
|
|
|
|
/* If a variadic macro. */
|
|
unsigned int variadic : 1;
|
|
|
|
/* If macro defined in system header. */
|
|
unsigned int syshdr : 1;
|
|
|
|
/* Nonzero if it has been expanded or had its existence tested. */
|
|
unsigned int used : 1;
|
|
|
|
/* Indicate which field of 'exp' is in use. */
|
|
unsigned int traditional : 1;
|
|
};
|