parse.y (register_incomplete_type): Include JDEP_FIELD as a case where an enclosing...

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

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 4812eb9244189b74481c2d3aa0a670216b4c5555..14069ab06e31ffc6f8ec86faf0061d3cca6b0b63 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -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

diff --git a/gcc/java/parse.y b/gcc/java/parse.y
index 2a849f7129bffd12ced68643f606d23b9659a713..fce75642764c92627396256bedc735d979cf0483 100644 (file)
--- a/gcc/java/parse.y
+++ b/gcc/java/parse.y
@@ -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))