diff options
| author | apbianco <apbianco@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-10-19 04:19:09 +0000 |
|---|---|---|
| committer | apbianco <apbianco@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-10-19 04:19:09 +0000 |
| commit | 6a6de9c5a8bf31e918d13e2ded315b7dd0eaf1ed (patch) | |
| tree | a8158ec2c5d37f890d042e47898a6b93ffdc3d96 /gcc/java/lex.c | |
| parent | 3f4a943b411e798b50ac1f6d35d3e127589b372a (diff) | |
| download | ppe42-gcc-6a6de9c5a8bf31e918d13e2ded315b7dd0eaf1ed.tar.gz ppe42-gcc-6a6de9c5a8bf31e918d13e2ded315b7dd0eaf1ed.zip | |
2000-10-18 Alexandre Petit-Bianco <apbianco@cygnus.com>
* gjavah.c (add_class_decl): Removed unused variables `tname',
`tlen' and `name_index'.
* java-tree.h (BUILD_FILENAME_IDENTIFIER_NODE): New macro.
* jcf-parse.c (jcf_parse_source): Use it and set EXPR_WFL_FILENAME
in `wfl_operator' with value.
(yyparse): Use BUILD_FILENAME_IDENTIFIER_NODE.
(jcf_figure_file_type): Fixed identation.
* lex.c (java_get_line_col): Use EOF. Tuned `^' placement.
* parse.y (analyze_clinit_body): New function.
(static_initializer:): Reset `current_static_block'.
(java_parser_context_restore_global): Set EXPR_WFL_FIILENAME_NODE in
`wfl_operator' with new value.
(lookup_cl): Use EXPR_WFL_FILENAME.
(maybe_yank_clinit): Handle bogus <clinit> bodies, call
analyze_clinit_body.
(build_outer_field_access): Access to this$<n> built from
current_class, not its outer context.
(build_access_to_thisn): Fixed leading comment. Tidied things up.
(resolve_qualified_expression_name): Handle `T.this' and `T.this.f()'.
(patch_method_invocation): Use `is_static_flag' when already
initialized.
(patch_newarray): Removed assignment in ternary operator.
(http://gcc.gnu.org/ml/gcc-patches/2000-10/msg00629.html)
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@36946 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/java/lex.c')
| -rw-r--r-- | gcc/java/lex.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/java/lex.c b/gcc/java/lex.c index 1775441d329..329d6287759 100644 --- a/gcc/java/lex.c +++ b/gcc/java/lex.c @@ -1526,7 +1526,7 @@ java_get_line_col (filename, line, col) while (cline != line) { c = getc (fp); - if (c < 0) + if (c == EOF) { static char msg[] = "<<file too short - unexpected EOF>>"; obstack_grow (&temporary_obstack, msg, sizeof(msg)-1); @@ -1563,7 +1563,7 @@ java_get_line_col (filename, line, col) /* Place the '^' a the right position */ base = obstack_base (&temporary_obstack); - for (ccol = 1; ccol <= col; ccol++) + for (ccol = 1; ccol <= col+3; ccol++) { /* Compute \t when reaching first_non_space */ char c = (first_non_space ? |
