diff options
| author | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-10-21 06:28:27 +0000 |
|---|---|---|
| committer | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-10-21 06:28:27 +0000 |
| commit | 417c8d6753c8d675d4f52dc1cfb6ce4fe5883a5f (patch) | |
| tree | 06875fe303c3f5b9803db8e7580906811ee27972 /gcc/java | |
| parent | a5c6ce6996b62249833202a820743d2cf62fd324 (diff) | |
| download | gcc-417c8d6753c8d675d4f52dc1cfb6ce4fe5883a5f.tar.gz | |
2000-08-15 Bryce McKinlay <bryce@albatross.co.nz>
* parse.y (do_resolve_class): Also explore superclasses of
intermediate enclosing contexts when searching for inner classes.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@36990 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/java')
| -rw-r--r-- | gcc/java/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/java/parse.y | 10 |
2 files changed, 11 insertions, 4 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 3932d8132e8..349d5c5d999 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -423,6 +423,11 @@ Wed Sep 13 11:50:35 2000 Alexandre Petit-Bianco <apbianco@cygnus.com> compression_method fields. * zextract.c (read_zip_archive): Collect file compression info. +2000-08-15 Bryce McKinlay <bryce@albatross.co.nz> + + * parse.y (do_resolve_class): Also explore superclasses of + intermediate enclosing contexts when searching for inner classes. + 2000-08-11 Alexandre Petit-Bianco <apbianco@cygnus.com> * parse.y (variable_declarator_id:): Better error message. diff --git a/gcc/java/parse.y b/gcc/java/parse.y index 6dc13ea50fa..2a849f7129b 100644 --- a/gcc/java/parse.y +++ b/gcc/java/parse.y @@ -5488,15 +5488,17 @@ do_resolve_class (enclosing, class_type, decl, cl) while (enclosing) { tree name; + tree intermediate; if ((new_class_decl = find_as_inner_class (enclosing, class_type, cl))) return new_class_decl; - + + intermediate = enclosing; /* Explore enclosing contexts. */ - while (INNER_CLASS_DECL_P (enclosing)) + while (INNER_CLASS_DECL_P (intermediate)) { - enclosing = DECL_CONTEXT (enclosing); - if ((new_class_decl = find_as_inner_class (enclosing, + intermediate = DECL_CONTEXT (intermediate); + if ((new_class_decl = find_as_inner_class (intermediate, class_type, cl))) return new_class_decl; } |