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/input.h | |
| 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/input.h')
| -rw-r--r-- | gcc/input.h | 38 |
1 files changed, 24 insertions, 14 deletions
diff --git a/gcc/input.h b/gcc/input.h index 0bc15de..6dd1252 100644 --- a/gcc/input.h +++ b/gcc/input.h @@ -19,24 +19,32 @@ along with GCC; see the file COPYING. If not, write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* Source file current line is coming from. */ -extern const char *input_filename; +#ifndef GCC_INPUT_H +#define GCC_INPUT_H -/* Top-level source file. */ -extern const char *main_input_filename; +/* The data structure used to record a location in a translation unit. */ +struct location_s GTY (()) +{ + /* The name of the source file involved. */ + const char *file; -/* Line number in current source file. */ -extern int input_line; - -/* Stream for reading from input file. */ -extern FILE *finput; + /* The line-location in the source file. */ + int line; +}; +typedef struct location_s location_t; struct file_stack - { - const char *name; - struct file_stack *next; - int line; - }; +{ + struct file_stack *next; + location_t location; +}; + +/* Top-level source file. */ +extern const char *main_input_filename; + +extern location_t input_location; +#define input_line (input_location.line) +#define input_filename (input_location.file) /* Stack of currently pending input files. The line member is not accurate for the innermost file on the stack. */ @@ -47,3 +55,5 @@ extern int input_file_stack_tick; extern void push_srcloc PARAMS ((const char *name, int line)); extern void pop_srcloc PARAMS ((void)); + +#endif |