diff options
| author | Nathan Sidwell <nathan@codesourcery.com> | 2003-05-02 11:33:06 +0000 |
|---|---|---|
| committer | Nathan Sidwell <nathan@gcc.gnu.org> | 2003-05-02 11:33:06 +0000 |
| commit | 6060edcbe24aaa467d5be6fe35bd52a6eecc72b3 (patch) | |
| tree | b2aeb7d7392849bc90e2ce9edf59756e4b8ede1d /gcc/toplev.c | |
| parent | ce61bf7ba759d99356b5fcdaa2bd6883395be016 (diff) | |
| download | gcc-6060edcbe24aaa467d5be6fe35bd52a6eecc72b3.zip gcc-6060edcbe24aaa467d5be6fe35bd52a6eecc72b3.tar.gz gcc-6060edcbe24aaa467d5be6fe35bd52a6eecc72b3.tar.bz2 | |
Makefile.in (TREE_H): Replace location.h with input.h.
* Makefile.in (TREE_H): Replace location.h with input.h.
(GTFILES) Remove location.h
(gt-lists.h): Replace gt-location.h with gt-input.h
* input.h (input_filename, input_line): Remove variables.
(location_s, location_t): Move from location.h.
(input_location): New.
(input_filename, input_line): New #defines.
* location.h: Remove.
* tree.h: Replace location.h with input.h.
(input_filename, input_line): Remove.
* diagnostic.h: Replace location.h with input.h.
* gcc.h (input_filename, input_filename_length): Remove declarations.
* toplev.c (input_filename, input_line): Remove.
(input_location): Define.
(push_srcloc, pop_srcloc): Adjust.
* diagnostic.c (diagnostic_report_current_module): Adjust.
f:
* lex.c (ffelex_file_pop_): Adjust file_stack member use.
(ffelex_file_push_): Likewise.
(ffelex_hash_): Likewise.
java:
* lex.h (input_lineno): Remove declaration.
* parse-scan.y: #include input.h.
(input_filename): Remove declaration.
(input_location): Add definition.
(input_line): Remove definition.
From-SVN: r66378
Diffstat (limited to 'gcc/toplev.c')
| -rw-r--r-- | gcc/toplev.c | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/gcc/toplev.c b/gcc/toplev.c index 0aee80f..fc25ca4 100644 --- a/gcc/toplev.c +++ b/gcc/toplev.c @@ -149,20 +149,15 @@ const char *progname; int save_argc; char **save_argv; -/* Name of current original source file (what was input to cpp). - This comes from each #-command in the actual input. */ - -const char *input_filename; - /* Name of top-level original source file (what was input to cpp). This comes from the #-command at the beginning of the actual input. If there isn't any there, then this is the cc1 input file name. */ const char *main_input_filename; -/* Current line number in real source file. */ +/* Current position in real source file. */ -int input_line; +location_t input_location; /* Nonzero if it is unsafe to create any new pseudo registers. */ int no_new_pseudos; @@ -2147,14 +2142,12 @@ push_srcloc (file, line) struct file_stack *fs; if (input_file_stack) - { - input_file_stack->name = input_filename; - input_file_stack->line = input_line; - } + input_file_stack->location = input_location; fs = (struct file_stack *) xmalloc (sizeof (struct file_stack)); - fs->name = input_filename = file; - fs->line = input_line = line; + input_filename = file; + input_line = line; + fs->location = input_location; fs->next = input_file_stack; input_file_stack = fs; input_file_stack_tick++; @@ -2175,10 +2168,7 @@ pop_srcloc () input_file_stack_tick++; if (input_file_stack) - { - input_filename = input_file_stack->name; - input_line = input_file_stack->line; - } + input_location = input_file_stack->location; else { input_filename = NULL; |