This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

[PATCH] Java: Minor side fix to gcj/316's fix.


Bryce's fix to gcj/316 unraveled a regression that this patch takes
care of. I'm checking this in.

./A

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.

Index: parse.y
===================================================================
RCS file: /cvs/gcc/egcs/gcc/java/parse.y,v
retrieving revision 1.220
diff -u -p -r1.220 parse.y
--- parse.y	2000/10/21 06:28:27	1.220
+++ parse.y	2000/10/25 05:35:26
@@ -4998,7 +4998,8 @@ register_incomplete_type (kind, wfl, dec
   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,
 
       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))

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]