diff options
| author | Alexandre Petit-Bianco <apbianco@cygnus.com> | 2000-06-01 07:44:58 +0000 |
|---|---|---|
| committer | Alexandre Petit-Bianco <apbianco@gcc.gnu.org> | 2000-06-01 00:44:58 -0700 |
| commit | 152de068640f04fc98afdd252a828d7f601c5d65 (patch) | |
| tree | 586253d11f233cbb77aa2d57a0c67ea6ec106370 /gcc/java/class.c | |
| parent | 3aac3c2fd48d6b18b196acb1b9ad5cf9a0cd85ac (diff) | |
| download | gcc-152de068640f04fc98afdd252a828d7f601c5d65.zip gcc-152de068640f04fc98afdd252a828d7f601c5d65.tar.gz gcc-152de068640f04fc98afdd252a828d7f601c5d65.tar.bz2 | |
class.c (common_enclosing_context_p): New function.
2000-04-24 Alexandre Petit-Bianco <apbianco@cygnus.com>
* class.c (common_enclosing_context_p): New function.
* java-tree.h (common_enclosing_context_p): Added prototype.
* parse.h (INNER_ENCLOSING_SCOPE_CHECK): Relaxed test to allow
classes sharing an outer context with the current instance.
* parse.y (build_access_to_thisn): Fixed leading comment.
(verify_constructor_super): New local `supper_inner'. Skip
enclosing context argument in the case of inner class constructors.
(patch_method_invocation): Insert proper context as second
parameter to pure inner class constructor super invocations.
This fixes the Java PR #177.
From-SVN: r34332
Diffstat (limited to 'gcc/java/class.c')
| -rw-r--r-- | gcc/java/class.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/gcc/java/class.c b/gcc/java/class.c index 21232e7..dcc5448 100644 --- a/gcc/java/class.c +++ b/gcc/java/class.c @@ -486,6 +486,30 @@ enclosing_context_p (type1, type2) return 0; } +/* Return 1 iff there exists a common enclosing context between TYPE1 + and TYPE2. */ + +int common_enclosing_context_p (type1, type2) + tree type1, type2; +{ + if (!PURE_INNER_CLASS_TYPE_P (type1) && !PURE_INNER_CLASS_TYPE_P (type2)) + return 0; + + for (type1 = TREE_TYPE (DECL_CONTEXT (TYPE_NAME (type1))); type1; + type1 = (PURE_INNER_CLASS_TYPE_P (type1) ? + TREE_TYPE (DECL_CONTEXT (TYPE_NAME (type1))) : NULL_TREE)) + { + tree current; + for (current = TREE_TYPE (DECL_CONTEXT (TYPE_NAME (type2))); current; + current = (PURE_INNER_CLASS_TYPE_P (current) ? + TREE_TYPE (DECL_CONTEXT (TYPE_NAME (current))) : + NULL_TREE)) + if (type1 == current) + return 1; + } + return 0; +} + static void add_interface_do (basetype_vec, interface_class, i) tree basetype_vec, interface_class; |