From 908fecca8cba9118747951b2d9883b8abd4a94b6 Mon Sep 17 00:00:00 2001 From: Bryce McKinlay Date: Tue, 9 Oct 2001 05:40:35 +0000 Subject: [PATCH] parse.y (find_as_inner_class): Don't disregard the enclosing scope when name qualifier matches a package name. * parse.y (find_as_inner_class): Don't disregard the enclosing scope when name qualifier matches a package name. From-SVN: r46113 --- gcc/java/ChangeLog | 5 +++++ gcc/java/parse.y | 13 +------------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 52ccdabebe3..d32998b3027 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,8 @@ +2001-10-09 Bryce McKinlay + + * parse.y (find_as_inner_class): Don't disregard the enclosing scope + when name qualifier matches a package name. + 2001-10-08 Tom Tromey Fix for PR java/4489: diff --git a/gcc/java/parse.y b/gcc/java/parse.y index 2737579d536..180b99ddcef 100644 --- a/gcc/java/parse.y +++ b/gcc/java/parse.y @@ -3636,18 +3636,7 @@ find_as_inner_class (enclosing, name, cl) acc = merge_qualified_name (acc, EXPR_WFL_NODE (TREE_PURPOSE (qual))); BUILD_PTR_FROM_NAME (ptr, acc); - - /* Don't try to resolve ACC as a class name if it follows - the current package name. We don't want to pick something - that's accidentally there: for example `a.b.c' in package - `a.b' shouldn't trigger loading `a' if it's there by - itself. */ - if (ctxp->package - && strstr (IDENTIFIER_POINTER (ctxp->package), - IDENTIFIER_POINTER (acc))) - decl = NULL; - else - decl = do_resolve_class (NULL_TREE, ptr, NULL_TREE, cl); + decl = do_resolve_class (NULL_TREE, ptr, NULL_TREE, cl); } /* A NULL qual and a decl means that the search ended -- 2.30.2