parse.y (register_incomplete_type): Include JDEP_FIELD as a case where an enclosing context can be set on the jdep.

2000-10-24  Alexandre Petit-Bianco  <apbianco@cygnus.com>

	* parse.y (register_incomplete_type): Include JDEP_FIELD as a case
	where an enclosing context can be set on the jdep.
	(do_resolve_class): Fixed identation.

(http://gcc.gnu.org/ml/gcc-patches/2000-10/msg00824.html)

From-SVN: r37045
This commit is contained in:
Alexandre Petit-Bianco 2000-10-25 05:47:28 +00:00 committed by Alexandre Petit-Bianco
parent e004f2f76e
commit 8ac1de05dd
2 changed files with 9 additions and 2 deletions

View File

@ -1,3 +1,9 @@
2000-10-24 Alexandre Petit-Bianco <apbianco@cygnus.com>
* parse.y (register_incomplete_type): Include JDEP_FIELD as a case
where an enclosing context can be set on the jdep.
(do_resolve_class): Fixed identation.
2000-10-21 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* gjavah.c (NEED_PEEK_ATTRIBUTE, NEED_SKIP_ATTRIBUTE): Define

View File

@ -4998,7 +4998,8 @@ register_incomplete_type (kind, wfl, decl, ptr)
JDEP_MISC (new) = NULL_TREE;
/* For some dependencies, set the enclosing class of the current
class to be the enclosing context */
if ((kind == JDEP_SUPER || kind == JDEP_INTERFACE || kind == JDEP_ANONYMOUS)
if ((kind == JDEP_SUPER || kind == JDEP_INTERFACE
|| kind == JDEP_ANONYMOUS || kind == JDEP_FIELD)
&& GET_ENCLOSING_CPC ())
JDEP_ENCLOSING (new) = TREE_VALUE (GET_ENCLOSING_CPC ());
else
@ -5492,7 +5493,7 @@ do_resolve_class (enclosing, class_type, decl, cl)
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 (intermediate))