From e1d565ab93905c52c3cfc312bff123b0c14b36b4 Mon Sep 17 00:00:00 2001 From: Bryce McKinlay Date: Sat, 21 Oct 2000 06:28:27 +0000 Subject: [PATCH] parse.y (do_resolve_class): Also explore superclasses of intermediate enclosing contexts when... 2000-08-15 Bryce McKinlay * parse.y (do_resolve_class): Also explore superclasses of intermediate enclosing contexts when searching for inner classes. From-SVN: r36990 --- gcc/java/ChangeLog | 5 +++++ 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 compression_method fields. * zextract.c (read_zip_archive): Collect file compression info. +2000-08-15 Bryce McKinlay + + * parse.y (do_resolve_class): Also explore superclasses of + intermediate enclosing contexts when searching for inner classes. + 2000-08-11 Alexandre Petit-Bianco * 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; } -- 2.30.2