diff options
| author | neil <neil@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-04-22 17:48:02 +0000 |
|---|---|---|
| committer | neil <neil@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-04-22 17:48:02 +0000 |
| commit | 02516fb963e11f14d14af2872cd6cc89f31a4050 (patch) | |
| tree | 0fc130b06a7d9e6cdc2502aaa5f671bb726c8773 /gcc/cpphash.h | |
| parent | 4c068d0799c7b8e0f3f6735e49eb58e481981a44 (diff) | |
| download | gcc-02516fb963e11f14d14af2872cd6cc89f31a4050.tar.gz | |
* cppfiles.c (_cpp_pop_file_buffer): Return void. Move
file change and include code to _cpp_pop_buffer.
* cpphash.h (struct pending_option): Predeclare.
(struct cpp_reader): New member next_include_file.
(_cpp_pop_file_buffer): Update.
(_cpp_push_next_buffer): Update, rename.
* cppinit.c (cpp_destroy): Free include chain and pending here.
(cpp_finish_options): Simplify.
(_cpp_push_next_buffer): Rename and clean up.
* cpplib.c (cpp_pop_buffer): Move code from _cpp_pop_file_buffer.
Clarify.
* cppmacro.c (cpp_scan_nooutput): Set return_at_eof here.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@52621 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cpphash.h')
| -rw-r--r-- | gcc/cpphash.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/gcc/cpphash.h b/gcc/cpphash.h index e101bb3ef90..773c3cc954f 100644 --- a/gcc/cpphash.h +++ b/gcc/cpphash.h @@ -26,6 +26,7 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "hashtable.h" struct directive; /* Deliberately incomplete. */ +struct pending_option; /* Test if a sign is valid within a preprocessing number. */ #define VALID_SIGN(c, prevc) \ @@ -250,6 +251,11 @@ struct cpp_reader /* If in_directive, the directive if known. */ const struct directive *directive; + /* The next -include-d file; NULL if they all are done. If it + points to NULL, the last one is in progress, and + _cpp_maybe_push_include_file has yet to restore the line map. */ + struct pending_option **next_include_file; + /* Multiple inlcude optimisation. */ const cpp_hashnode *mi_cmacro; const cpp_hashnode *mi_ind_cmacro; @@ -381,7 +387,7 @@ extern int _cpp_compare_file_date PARAMS ((cpp_reader *, extern void _cpp_report_missing_guards PARAMS ((cpp_reader *)); extern void _cpp_init_includes PARAMS ((cpp_reader *)); extern void _cpp_cleanup_includes PARAMS ((cpp_reader *)); -extern bool _cpp_pop_file_buffer PARAMS ((cpp_reader *, +extern void _cpp_pop_file_buffer PARAMS ((cpp_reader *, struct include_file *)); /* In cppexp.c */ @@ -396,7 +402,7 @@ extern int _cpp_equiv_tokens PARAMS ((const cpp_token *, extern void _cpp_init_tokenrun PARAMS ((tokenrun *, unsigned int)); /* In cppinit.c. */ -extern bool _cpp_push_next_buffer PARAMS ((cpp_reader *)); +extern void _cpp_maybe_push_include_file PARAMS ((cpp_reader *)); /* In cpplib.c */ extern int _cpp_test_assertion PARAMS ((cpp_reader *, int *)); |