diff options
| author | Devang Patel <dpatel@apple.com> | 2005-12-07 19:48:55 +0000 |
|---|---|---|
| committer | Devang Patel <dpatel@apple.com> | 2005-12-07 19:48:55 +0000 |
| commit | 8b25a5557b65eed26c9229e67168cd0c4526c695 (patch) | |
| tree | 9e03692c63ad0c7d29c01c73d6c40a2d7f46b0fc /gcc/cp/cp-tree.h | |
| parent | 23adafc818e3410050b44ee40b9a0c89c45117fc (diff) | |
[gcc/ChangeLog.apple-ppc]
2005-06-19 Ziemowit Laski <zlaski@apple.com>
Radar 4137741
* Makefile.in (c-lex.o): Revert langhooks.h dependency.
(langhooks.o): Revert debug.h dependency.
* c-lex.c: Do not include langhooks.h.
(fe_file_change): Revert lang_hooks calls; issue debug_hooks
calls only if defer_file_change_debug_hooks flag is cleared.
(c_lex_with_flags): Propagate line number information for
CPP_BINCL and CPP_EINCL tokens.
* langhooks-def.h: Revert Radar 4133801 changes.
* langhooks.c: Likewise.
* langhooks.h: Likewise.
[gcc/cp/ChangeLog.apple-ppc]
2005-06-19 Ziemowit Laski <zlaski@apple.com>
Radar 4137741
* cp-objcp-common.h: Revert Radar 4133801 changes.
* cp-tree.h: Likewise.
* decl2.c: Likewise.
* parser.c: Likewise.
(cp_lexer_handle_pragma): Rename to cp_lexer_handle_pragma_etc();
handle CPP_BINCL and CPP_EINCL tokens in addition to CPP_PRAGMA.
(cp_lexer_new_main): Set defer_file_change_debug_hooks flag
in preprocessor.
(cp_parser_statement, cp_parser_declaration_seq_opt,
cp_parser_member_specification_opt, cp_parser_cw_asm_declaration_seq_opt,
cp_parser_cw_asm_statement, cp_parser_objc_interstitial_code):
Call cp_lexer_handle_pragma_etc() for CPP_BINCL and CPP_EINCL tokens
also.
[libcpp/ChangeLog.apple-ppc]
2005-06-19 Ziemowit Laski <zlaski@apple.com>
Radar 4137741
* directives.c (_cpp_do_file_change): If preprocessor
defer_file_change_debug_hooks flag is set, synthesize CPP_BINCL
and CPP_EINCL tokens.
* init.c (cpp_create_reader): Initialize token run (and associated
pointers) for storing CPP_EINCL tokens.
* internal.h (struct cpp_reader): Add new fields for storing
CPP_EINCL tokens.
(_cpp_next_tokenrun): Add declaration.
* lex.c (next_tokenrun): Make externally visible and rename to
_cpp_next_tokenrun().
(_cpp_temp_token): Call _cpp_next_tokenrun() instead of
next_tokenrun().
(_cpp_lex_token): Likewise; return any pending CPP_EINCL tokens
before returning token actually read.
* include/cpplib.h (TTYPE_TABLE): Define new CPP_BINCL and CPP_EINCL
token types, similar to CPP_PRAGMA.
(cpp_options): Define new defer_file_change_debug_hooks flag.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/apple-local-200502-branch@108177 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cp/cp-tree.h')
| -rw-r--r-- | gcc/cp/cp-tree.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index 59f009adb80..e5324c3b794 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -4436,11 +4436,6 @@ extern void cp_genericize (tree); extern tree cw_asm_cp_build_component_ref (tree, tree); /* APPLE LOCAL end CW asm blocks */ -/* APPLE LOCAL begin 4133801 */ -extern void cp_start_source_file (int, const char *); -extern void cp_end_source_file (int, const char *); -extern void cp_flush_lexer_file_stack (void); -/* APPLE LOCAL end 4133801 */ /* -- end of C++ */ /* In order for the format checking to accept the C++ frontend |