OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

parse.y (find_as_inner_class): Don't disregard the enclosing scope when name qualifier matches a package name.

Browse Source 
* parse.y (find_as_inner_class): Don't disregard the enclosing scope
        when name qualifier matches a package name.

From-SVN: r46113
This commit is contained in:
Bryce McKinlay 2001-10-09 05:40:35 +00:00 committed by Bryce McKinlay
parent 3c017635c9
commit 908fecca8c
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/java/ChangeLog
View File

@ -1,3 +1,8 @@
2001-10-09 Bryce McKinlay <bryce@waitaki.otago.ac.nz>
* parse.y (find_as_inner_class): Don't disregard the enclosing scope
when name qualifier matches a package name.
2001-10-08 Tom Tromey <tromey@redhat.com>
Fix for PR java/4489:

13
gcc/java/parse.y
View File

@ -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