diff options
Diffstat (limited to 'gcc/java')
| -rw-r--r-- | gcc/java/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/java/lex.h | 1 | ||||
| -rw-r--r-- | gcc/java/parse-scan.y | 11 |
3 files changed, 14 insertions, 6 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 4dedd5d..546e679 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,11 @@ +2003-05-02 Nathan Sidwell <nathan@codesourcery.com> + + * lex.h (input_lineno): Remove declaration. + * parse-scan.y: #include input.h. + (input_filename): Remove declaration. + (input_location): Add definition. + (input_line): Remove definition. + 2003-05-01 Nathan Sidwell <nathan@codesourcery.com> * lex.h (lineno): Rename to ... diff --git a/gcc/java/lex.h b/gcc/java/lex.h index 3c924e4..850ce68 100644 --- a/gcc/java/lex.h +++ b/gcc/java/lex.h @@ -29,7 +29,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ /* Extern global variables declarations */ extern FILE *finput; -extern int input_lineno; /* A Unicode character, as read from the input file */ typedef unsigned short unicode_t; 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; |