diff options
| author | Alexandre Petit-Bianco <apbianco@cygnus.com> | 2000-10-25 05:47:28 +0000 |
|---|---|---|
| committer | Alexandre Petit-Bianco <apbianco@gcc.gnu.org> | 2000-10-24 22:47:28 -0700 |
| commit | 8ac1de05dd3615e99d25bf173b11ca824d4e8100 (patch) | |
| tree | f7080f8599005f3086d2002c2d4effd538f26156 /gcc/java | |
| parent | e004f2f76e03ff21d9c834302098db16133ed3b9 (diff) | |
| download | gcc-8ac1de05dd3615e99d25bf173b11ca824d4e8100.zip gcc-8ac1de05dd3615e99d25bf173b11ca824d4e8100.tar.gz gcc-8ac1de05dd3615e99d25bf173b11ca824d4e8100.tar.bz2 | |
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
Diffstat (limited to 'gcc/java')
| -rw-r--r-- | gcc/java/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/java/parse.y | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 4812eb9..14069ab 100644 --- 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 2a849f7..fce7564 100644 --- 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)) |