diff options
| author | bothner <bothner@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-03-16 06:12:53 +0000 |
|---|---|---|
| committer | bothner <bothner@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-03-16 06:12:53 +0000 |
| commit | 869705e1ef9d6a40e9ef63b4b8c3f76eb89f0648 (patch) | |
| tree | 0a4026ba59dfbefaf55f78c6c5ea44e375253b02 /gcc | |
| parent | 34c8cd8dca4cf0dfd74761b30ebc208f7e8c54af (diff) | |
| download | ppe42-gcc-869705e1ef9d6a40e9ef63b4b8c3f76eb89f0648.tar.gz ppe42-gcc-869705e1ef9d6a40e9ef63b4b8c3f76eb89f0648.zip | |
* jcf-parse.c (yyparse): Set/reset input_filename for source file.
* parse.y (java_expand_classes): Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@40541 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc')
| -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 578ea4ed16e..31c4d4c5a33 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 6ace7e8134d..b7a4c0b95f2 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 b40de8e81e9..b29d1708435 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. */ |
