cppfiles.c (struct include_file): Move from cpphash.h.
authorNeil Booth <neilb@earthling.net>
Thu, 7 Dec 2000 23:17:56 +0000 (23:17 +0000)
committerNeil Booth <neil@gcc.gnu.org>
Thu, 7 Dec 2000 23:17:56 +0000 (23:17 +0000)
commit642ce434645564d7f02c4acefe90b74a0eca5d09
tree7d2a48752253e693dd73859fe4a6329bee0871f1
parent02428c5d54c4280b35d33dfbed45c035ea9b4a06
cppfiles.c (struct include_file): Move from cpphash.h.

        * cppfiles.c (struct include_file): Move from cpphash.h.
        (_cpp_never_reread): New function.
        (open_file, read_include_file): Use it.
        (stack_include_file): Set the buffer's sysp according to the
        path in which the file was found.
        (find_include_file): Don't set sysp.
        (cpp_make_system_header, actual_directory): Update.
        (_cpp_execute_include): Do #include_next lookup handling here,
        not in cpplib.c.  Use _cpp_never_reread.
        * cpphash.h (struct_include_file): Remove.
        (struct cpp_buffer): New member sysp.
        (CPP_IN_SYSTEM_HEADER, _cpp_execute_include): Update.
        (_cpp_never_reread): New.
        * cpplib.c (read_line_number): Rename read_flag.  Rework slightly.
        (end_directive): Clear line_extension flag.
        (_cpp_handle_directive): Set line_extension flag for #number.
        (do_include_next): Handle path lookup in _cpp_execute_include.
        (do_line): Cleanup to use read_flag.  Don't allow flags in #line.
        (_cpp_do_file_change): Update.
        (do_pragma_once): Use cpp_never_reread.  Clean up.
        * cpplib.h (struct lexer_state): New member line_extension.

From-SVN: r38120
gcc/ChangeLog
gcc/cppfiles.c
gcc/cpphash.h
gcc/cpplib.c
gcc/cpplib.h