Changeset 3007

Timestamp:

07/12/05 02:14:24 (8 years ago)

Author:

moschny

Message:

• Merge changes from trunk to hotfix (i.e. stable) branch:

Error: Failed to load processor svn

No macro or processor named 'svn' found

Follow-up for [888], resolution to reopened ticket:63.

• Only generate fully qualified accesses, if the accessed variable

belongs to an enclosing class. Otherwise generate an access through
this.

File:

• branches/jp1_07g-hotfix/gj/src/gjc/v6/jp/TransBody.java (modified) (3 diffs)

branches/jp1_07g-hotfix/gj/src/gjc/v6/jp/TransBody.java

@@ -398 +398 @@
                         // Find referenced enclosing type the accessed
                         // variable belongs to. See See: BUG/0063
+                        boolean definedInOuterClass = false;
                         Type vowner = var.owner.type;
                         Type cclazz = c.clazz.type;
                         while (! cclazz.subType(vowner)) {
                             cclazz = cclazz.outer();
+                            definedInOuterClass = true;
                         }
 
@@ -413 +415 @@
                             c.f.at(Position.NOPOS);
                             ref = c.f.Ident(Names._this);
-                        } else if (tools.isFinal(var)) {
-                            // This is another great hack, because
-                            // final variables can not be initialized
-                            // with a fully qualified name, even with
-                            // javac. Is this a bug in javac and gj?
-                            c.f.at(Position.NOPOS);
-                            ref = c.f.Ident(Names._this);
                         } else if (! tools.hasRef(cclazz.tsym)) {
                             // A instance variable of an anonymous
@@ -427 +422 @@
                             ref = null;
                         } else {
-                            c.f.at(Position.NOPOS);
-                            ref = c.f.Select(tools.getRef(cclazz.tsym), Names._this);
+                            if (definedInOuterClass) {
+                                c.f.at(Position.NOPOS);
+                                ref = c.f.Select(tools.getRef(cclazz.tsym), Names._this);
+                            } else {
+                                c.f.at(Position.NOPOS);
+                                ref = c.f.Ident(Names._this);
+                            }
                         }
                         isStaticRef = false;