Changeset 888

Timestamp:

04/10/01 22:21:14 (12 years ago)

Author:

hauma

Message:

bugfix: There is no complete fix for ticket:63. This is a back-fix to

remove the generation of full qualified names for variable accesses
inside remote classes and for final variables. See TransBody for
details.

File:

• trunk/gj/src/gjc/v6/jp/TransBody.java (modified) (2 diffs)

trunk/gj/src/gjc/v6/jp/TransBody.java

@@ -14 +14 @@
 /*
  * $Source: /tmp/svn/cvs-repos/javaparty/gj/src/gjc/v6/jp/TransBody.java,v $
- * $Revision: 1.8 $
+ * $Revision: 1.9 $
  * $Aliases$
  * $Author: hauma $
- * $Date: 2001/04/10 19:16:38 $
+ * $Date: 2001/04/10 20:21:14 $
  * $State: Exp $
  */
@@ -456 +456 @@
                         // is important if inner classes come into
                         // play. See See: BUG/0063
-                        ref = c.f.Select(tools.getRef(cclazz.tsym), Names._this);
+                        if (tools.isRemote(cclazz)) {
+                            // This is a great hack, because otherwise
+                            // we must predict the class name of the
+                            // remote class after the transformation
+                            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?
+                            ref = c.f.Ident(Names._this);
+
+                        } else {
+                            ref = c.f.Select(tools.getRef(cclazz.tsym), Names._this);
+                        }
                         isStaticRef = false;
                         isSelfRef = true;