diff options
| -rw-r--r-- | gcc/java/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/java/jcf-parse.c | 2 | ||||
| -rw-r--r-- | gcc/java/parse.y | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 578ea4e..31c4d4c 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,8 +1,11 @@ 2001-03-15 Per Bothner <per@bothner.com> + * jcf-parse.c (yyparse): Set/reset input_filename for source file. + * parse.y (java_expand_classes): Likewise. + * parse.y (expand_start_java_method): Was only called once and had a misleading name, so inline in caller java_complete_expand_method. - (enter_a_block): Likewise inline in enter_blck and remove. + (enter_a_block): Likewise inline in enter_block and remove. Remove junk from when gcc/java was created (by copying from C/C++). * decl.c (keep_next_level_flag, keep_next_if_subblocks): Remove. diff --git a/gcc/java/jcf-parse.c b/gcc/java/jcf-parse.c index 6ace7e8..b7a4c0b 100644 --- a/gcc/java/jcf-parse.c +++ b/gcc/java/jcf-parse.c @@ -1064,8 +1064,10 @@ yyparse () for (ctxp = ctxp_for_generation; ctxp; ctxp = ctxp->next) { + input_filename = ctxp->filename; parse_source_file_2 (); } + input_filename = main_input_filename; java_expand_classes (); if (!java_report_errors () && !flag_syntax_only) diff --git a/gcc/java/parse.y b/gcc/java/parse.y index b40de8e..b29d170 100644 --- a/gcc/java/parse.y +++ b/gcc/java/parse.y @@ -8621,10 +8621,12 @@ java_expand_classes () for (; ctxp_for_generation; ctxp_for_generation = ctxp_for_generation->next) { ctxp = ctxp_for_generation; + input_filename = ctxp->filename; lang_init_source (2); /* Error msgs have method prototypes */ java_complete_expand_classes (); /* Complete and expand classes */ java_parse_abort_on_error (); } + input_filename = main_input_filename; /* Find anonymous classes and expand their constructor, now they have been fixed. */ |