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/java/parse-scan.y | |
| 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/java/parse-scan.y')
| -rw-r--r-- | gcc/java/parse-scan.y | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gcc/java/parse-scan.y b/gcc/java/parse-scan.y index 233a987..37d79d9 100644 --- a/gcc/java/parse-scan.y +++ b/gcc/java/parse-scan.y @@ -41,12 +41,15 @@ definitions and other extensions. */ #include "system.h" #include "coretypes.h" #include "tm.h" - +#include "input.h" #include "obstack.h" #include "toplev.h" -extern char *input_filename; extern FILE *finput, *out; + +/* Current position in real source file. */ + +location_t input_location; /* Obstack for the lexer. */ struct obstack temporary_obstack; @@ -54,11 +57,9 @@ struct obstack temporary_obstack; /* The current parser context. */ static struct parser_ctxt *ctxp; -/* Error and warning counts, current line number, because they're used - elsewhere */ +/* Error and warning counts, because they're used elsewhere */ int java_error_count; int java_warning_count; -int input_line; /* Tweak default rules when necessary. */ static int absorber; |