diff options
| author | Tom Tromey <tromey@redhat.com> | 2008-02-29 20:09:05 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2008-02-29 20:09:05 +0000 |
| commit | 966e8f4d3fa971039cad79e25de0f0cb385a9368 (patch) | |
| tree | 11ac9314a803ee4f351c76ac29b94a265faace5a /gcc/input.h | |
| parent | 3cbe0ba6aab8e6310613a7cfc1d153840f210cf7 (diff) | |
toplev.c (input_file_stack, [...]): Remove.
gcc
* toplev.c (input_file_stack, input_file_stack_tick, fs_p,
input_file_stack_history, input_file_stack_restored): Remove.
(push_srcloc, pop_srcloc, restore_input_file_stack): Likewise.
* input.h (struct file_stack): Remove.
(push_srcloc, pop_srcloc, restore_input_file_stack): Likewise.
(input_file_stack, input_file_stack_tick, INPUT_FILE_STACK_BITS):
Likewise.
* diagnostic.h (struct diagnostic_context) <last_module>: Change
type.
(diagnostic_last_module_changed): Add 'map' argument.
(diagnostic_set_last_function): Likewise.
* diagnostic.c (undiagnostic_report_current_module): Iterate using
line map, not input_file_stack.
* c-lex.c (fe_file_change): Don't use push_srcloc or pop_srcloc.
gcc/cp
* parser.c (struct cp_token) <input_file_stack_index>: Remove.
(cp_lexer_get_preprocessor_token): Update.
(cp_lexer_set_source_position_from_token): Don't call
restore_input_file_stack.
* lex.c (cxx_init): Don't use push_srcloc or pop_srcloc.
gcc/testsuite
* g++.dg/warn/pragma-system_header2.C: Ignore "included from"
line.
From-SVN: r132775
Diffstat (limited to 'gcc/input.h')
| -rw-r--r-- | gcc/input.h | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/gcc/input.h b/gcc/input.h index 4a3040c3d50..5d432592315 100644 --- a/gcc/input.h +++ b/gcc/input.h @@ -49,19 +49,10 @@ extern expanded_location expand_location (source_location); This could be removed but it hardly seems worth the effort. */ typedef source_location location_t; -struct file_stack -{ - struct file_stack *next; - location_t location; -}; - /* Top-level source file. */ extern const char *main_input_filename; extern location_t input_location; -extern void push_srcloc (location_t); -extern void pop_srcloc (void); -extern void restore_input_file_stack (int); #define LOCATION_FILE(LOC) ((expand_location (LOC)).file) #define LOCATION_LINE(LOC) ((expand_location (LOC)).line) @@ -69,14 +60,4 @@ extern void restore_input_file_stack (int); #define input_line LOCATION_LINE (input_location) #define input_filename LOCATION_FILE (input_location) -/* Stack of currently pending input files. - The line member is not accurate for the innermost file on the stack. */ -extern struct file_stack *input_file_stack; - -/* Incremented on each change to input_file_stack. */ -extern int input_file_stack_tick; - -/* The number of bits available for input_file_stack_tick. */ -#define INPUT_FILE_STACK_BITS 31 - #endif |