diff options
| -rw-r--r-- | gcc/java/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/java/parse.c | 3 | ||||
| -rw-r--r-- | gcc/java/parse.y | 3 |
3 files changed, 9 insertions, 2 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index 7e3e4d3..ecda527 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,8 @@ +Tue Mar 14 17:15:41 2000 Alexandre Petit-Bianco <apbianco@cygnus.com> + + * parse.y (register_incomplete_type): Fixed initialization of + JDEP_ENCLOSING. + 2000-02-14 Andrew Haley <aph@cygnus.com> * check-init.c (check_init): Add new cases for unary and binary diff --git a/gcc/java/parse.c b/gcc/java/parse.c index bb08b44..f4d3143 100644 --- a/gcc/java/parse.c +++ b/gcc/java/parse.c @@ -7581,7 +7581,8 @@ register_incomplete_type (kind, wfl, decl, ptr) JDEP_WFL (new) = wfl; JDEP_CHAIN (new) = NULL; JDEP_MISC (new) = NULL_TREE; - JDEP_ENCLOSING (new) = GET_CPC (); + if(!(JDEP_ENCLOSING (new) = GET_ENCLOSING_CPC_CONTEXT ())) + JDEP_ENCLOSING (new) = GET_CPC (); JDEP_GET_PATCH (new) = (tree *)NULL; JDEP_INSERT (ctxp->classd_list, new); diff --git a/gcc/java/parse.y b/gcc/java/parse.y index 4ef7752..0ccb630 100644 --- a/gcc/java/parse.y +++ b/gcc/java/parse.y @@ -4883,7 +4883,8 @@ register_incomplete_type (kind, wfl, decl, ptr) JDEP_WFL (new) = wfl; JDEP_CHAIN (new) = NULL; JDEP_MISC (new) = NULL_TREE; - JDEP_ENCLOSING (new) = GET_CPC (); + if(!(JDEP_ENCLOSING (new) = GET_ENCLOSING_CPC_CONTEXT ())) + JDEP_ENCLOSING (new) = GET_CPC (); JDEP_GET_PATCH (new) = (tree *)NULL; JDEP_INSERT (ctxp->classd_list, new); |