r111569 - in /branches/apple/trunk: gcc/ChangeL...

[dpatel at gcc dot gnu dot org]

Author: dpatel
Date: Tue Feb 28 18:35:51 2006
New Revision: 111569

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=111569
Log:
2005-02-28  Devang Patel  <dpatel@apple.com>
           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.

        * 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.

        * 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.

Modified:
    branches/apple/trunk/gcc/ChangeLog.apple-ppc
    branches/apple/trunk/gcc/Makefile.in
    branches/apple/trunk/gcc/c-lex.c
    branches/apple/trunk/gcc/cp/ChangeLog.apple-ppc
    branches/apple/trunk/gcc/cp/cp-objcp-common.h
    branches/apple/trunk/gcc/cp/cp-tree.h
    branches/apple/trunk/gcc/cp/decl2.c
    branches/apple/trunk/gcc/cp/parser.c
    branches/apple/trunk/gcc/langhooks-def.h
    branches/apple/trunk/gcc/langhooks.c
    branches/apple/trunk/gcc/langhooks.h
    branches/apple/trunk/libcpp/ChangeLog.apple-ppc
    branches/apple/trunk/libcpp/directives.c
    branches/apple/trunk/libcpp/include/cpplib.h
    branches/apple/trunk/libcpp/init.c
    branches/apple/trunk/libcpp/internal.h
    branches/apple/trunk/libcpp/lex.c