fix for Tracker use of qualified super() call for inner class

BobHanson · BobHanson · commit ea44a96ce906 · 2020-04-15T17:53:36.000-05:00
diff --git a/sources/net.sf.j2s.core/.settings/org.eclipse.jdt.core.prefs b/sources/net.sf.j2s.core/.settings/org.eclipse.jdt.core.prefs
@@ -8,17 +8,8 @@ org.eclipse.jdt.core.compiler.annotation.nonnullbydefault.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
 org.eclipse.jdt.core.compiler.annotation.nullable.secondary=
 org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=11
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.APILeak=warning
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=warning
 org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
 org.eclipse.jdt.core.compiler.problem.deadCode=warning
@@ -28,7 +19,6 @@ org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
 org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=warning
 org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
@@ -110,5 +100,3 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.release=disabled
-org.eclipse.jdt.core.compiler.source=11
diff --git a/sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/net.sf.j2s.core.jar b/sources/net.sf.j2s.core/dist/swingjs/net.sf.j2s.core.jar
diff --git a/sources/net.sf.j2s.core/dist/swingjs/timestamp b/sources/net.sf.j2s.core/dist/swingjs/timestamp
@@ -1 +1 @@
-20200414130547 
+20200415174852 
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/SwingJS-site.zip b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/net.sf.j2s.core.jar b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/net.sf.j2s.core.jar
diff --git a/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/timestamp b/sources/net.sf.j2s.core/dist/swingjs/ver/3.2.9/timestamp
@@ -1 +1 @@
-20200414130547 
+20200415174852 
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/CorePlugin.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/CorePlugin.java
@@ -30,7 +30,7 @@ public class CorePlugin extends Plugin {
 	// if you change the x.x.x number, be sure to also indicate that in 
 	// j2sApplet.js and also (Bob only) update.bat, update-clean.bat
 
-
+	// BH 2020.04.15 -- 3.2.9-v1g fix for qualified super() in inner classes using Class.super_ call (Tracker)
 	// BH 2020.04.05 -- 3.2.9-v1f (Boolean ? ...) not unboxed
 	// BH 2020.03.21 -- 3.2.9-v1e better v1c 
 	// BH 2020.03.20 -- 3.2.9-v1d proper check for new String("x") == "x" (should be false), but new integer(3) == 3 (true) 
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptVisitor.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/Java2ScriptVisitor.java
@@ -136,6 +136,7 @@
 // TODO: superclass inheritance for JAXB XmlAccessorType
 // TODO: inner classes of interface are duplicated
 
+//BH 2020.04.15 -- 3.2.9-v1g fix for qualified super() in inner classes using Class.super_ call (Tracker)
 //BH 2020.04.05 -- 3.2.9-v1f (Boolean ? ...) not unboxed
 //BH 2020.03.21 -- 3.2.9-v1e better v1c 
 //BH 2020.03.20 -- 3.2.9-v1d proper check for new String("x") == "x" (should be false), but new integer(3) == 3 (true) 
@@ -2904,6 +2905,13 @@ private void addSuperConstructor(SuperConstructorInvocation node, IMethodBinding
 			buffer.append("Clazz.super_(C$, this);\n");
 			return;
 		}
+
+		if (node.getExpression() != null) {
+			buffer.append(";Clazz.super_(C$,this,");
+			node.getExpression().accept(this);
+			buffer.append(")");
+		}
+
 		buffer.append(getFinalMethodNameWith$Params(";C$.superclazz.c$", node.resolveConstructorBinding(), null, false,
 				METHOD_NOTSPECIAL));
 		buffer.append(".apply(this,[");
@@ -4789,7 +4797,7 @@ private String getClassNameAndDot(ASTNode node, ITypeBinding declaringClass, boo
 	 */
 	private String getSyntheticReference(String className) {
 		return "this" + (className.equals("java.lang.Object") || className.equals("Object") ? ""
-				: className.equals(this$0Name) ? ".this$0"
+				//: className.equals(this$0Name) ? ".this$0"
 						: ".b$['" + getFinalJ2SClassName(className, FINAL_RAW) + "']");
 	}
 
diff --git a/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip b/sources/net.sf.j2s.java.core/dist/SwingJS-site.zip
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_InnerAo.java b/sources/net.sf.j2s.java.core/src/test/Test_InnerAo.java
@@ -0,0 +1,60 @@
+package test;
+
+
+public class Test_InnerAo extends Test_ { 
+
+	
+	public static int iteststatic = 0;
+	
+	public String atest = "Ao";
+
+	public int itest = 0; 
+	
+	public String stest = "Aos";
+	
+	Test_InnerAo() {
+		atest = "Ao*";
+		String xtest = "x";
+		Runnable x = new Runnable() {
+			
+			@Override
+			public void run() {
+				System.out.println("xtest is " + xtest + " atest=" + atest + " " + itest);
+				// TODO Auto-generated method stub
+				
+			}
+			
+		};
+		
+		x.run();
+	}
+     class Ai {
+    	 
+    	 public String atesti = "Ai";
+    	 
+         class Aii {
+        	 
+        	 // inner objects can point to "far" outer objects
+        	 public Aii(String string) {
+        		 stest = string;
+        		 System.out.println("--init Aii atest=Ao* is " + atest + " atesti=" + atesti + " " + string + " itest=" + ++itest + " iteststatic=" + ++iteststatic);
+        	 }
+        	 
+        	 public void test() {
+        		 System.out.println("--test Aii atest=Ao* is " + atest + " atesti=" + atesti + " itest=" + ++itest + " iteststatic=" + ++iteststatic + " stest=" + stest);
+        	 }
+        	 
+         } 
+    	 
+    	 public Ai(String string) {
+    		 stest = string;
+    		 System.out.println("-init Ai atest=Ao* is " + atest + " " + string + " itest=" + ++itest + " iteststatic=" + ++iteststatic);
+    	 }
+    	 
+    	 public void test() {
+    		 System.out.println("-test Ai atest=Ao* is " + atest + " itest=" + ++itest + " iteststatic=" + ++iteststatic + " stest=" + stest);
+    	 }
+    	 
+     }
+
+}
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_InnerBo.java b/sources/net.sf.j2s.java.core/src/test/Test_InnerBo.java
@@ -0,0 +1,123 @@
+package test;
+
+
+/**
+ * This test discovers the issue of a class requiring a qualified super()
+ * invocation because its superclass is an inner class.
+ * 
+ * Found in the OSP Tracker application. 
+ * 
+ * @author hansonr
+ *
+ */
+public class Test_InnerBo {
+
+// verified report is:
+	
+//	xtest is x atest=Ao* 0
+//	-init Ai atest=Ao* is Ao* 2nd itest=1 iteststatic=1
+//	-test Ai atest=Ao* is Ao* itest=2 iteststatic=2 stest=2nd
+//	-init Ai atest=Ao* is Ao* from ao.Bi itest=3 iteststatic=3
+//	-init ao.Bi
+//	-stest in Bi is null
+//	-test Ai atest=Ao* is Ao* itest=4 iteststatic=4 stest=from ao.Bi
+//	xtest is x atest=Ao* 0
+//	-init Ai atest=Ao* is Ao* from ao.Bi itest=1 iteststatic=5
+//	-init ao.Bi
+//	-stest in Bi is null
+//	-test Ai atest=Ao* is Ao* itest=2 iteststatic=6 stest=from ao.Bi
+//	xtest is x atest=Ao* 0
+//	-init Ai atest=Ao* is Ao* from ao.Bi itest=1 iteststatic=7
+//	-init ao.Bi
+//	-stest in Bi is null
+//	-test Ai atest=Ao* is Ao* itest=2 iteststatic=8 stest=from ao.Bi
+//	xtest is x atest=Ao* 0
+//	-init Ai atest=Ao* is Ao* from aob.Bi itest=1 iteststatic=9
+//	-init aobBi
+//	-stest in Bi is null
+//	-test Ai atest=Ao* is Ao* itest=2 iteststatic=10 stest=from aob.Bi
+//	xtest is x atest=Ao* 0
+//	-init Ai atest=Ao* is Ao* from ao.Bi itest=1 iteststatic=11
+//	-init ao.Bi
+//	xtest is x atest=Ao* 0
+//	-init Ai atest=Ao* is Ao* ai.bii itest=1 iteststatic=12
+//	--init Aii atest=Ao* is Ao* atesti=Ai from ai.Bii itest=2 iteststatic=13
+//	--init ai.Bii setting stest to from ai.Bii
+//	--stest in Bii is from ai.Bii
+//	--test Aii atest=Ao* is Ao* atesti=Ai itest=3 iteststatic=14 stest=from ai.Bii
+//	xtest is x atest=Ao* 0
+//	-init Ai atest=Ao* is Ao* from aob.Bi itest=1 iteststatic=15
+//	-init aobBi
+//	xtest is x atest=Ao* 0
+//	-init Ai atest=Ao* is Ao* ai.bii itest=1 iteststatic=16
+//	--init Aii atest=Ao* is Ao* atesti=Ai from ai.Bii itest=2 iteststatic=17
+//	--init ai.Bii setting stest to from ai.Bii
+//	--stest in Bii is from ai.Bii
+//	--test Aii atest=Ao* is Ao* atesti=Ai itest=3 iteststatic=18 stest=from ai.Bii	
+	
+	public String stest;
+
+	public class Bi extends Test_InnerAo.Ai {
+		
+		
+		public class Bii extends Test_InnerAo.Ai.Aii {
+			
+			public Bii(Test_InnerAo.Ai ai) {
+				ai.super("from ai.Bii");
+				stest = "from ai.Bii";
+				System.out.println("--init ai.Bii setting stest to " + stest);
+			}
+
+			// different constructors can reference different objects
+			public Bii(Test_InnerAo.Ai aib, boolean b) {
+				aib.super("from aib.Bii");
+				stest = "from aib.Bii";
+				System.out.println("--init aib.Bii setting stest to " + stest);
+
+			}
+			
+			@Override
+			public void test() {
+				System.out.println("--stest in Bii is " + stest);
+				super.test();
+			}
+			
+		}
+
+		public Bi(Test_InnerAo ao) {
+			ao.super("from ao.Bi");
+			System.out.println("-init ao.Bi");
+
+		}
+
+		public Bi(Test_InnerAo aob, boolean b) {
+			aob.super("from aob.Bi");
+			System.out.println("-init aobBi");
+
+		}
+		
+		@Override
+		public void test() {
+			System.out.println("-stest in Bi is " + stest);
+			super.test();
+		}
+		
+	}
+
+	
+	public static void main(String[] args) {
+		Test_InnerAo a =  new Test_InnerAo();
+		Test_InnerAo.Ai ai = a.new Ai("2nd");
+		ai.test();
+		new Test_InnerBo().new Bi(a).test();
+		new Test_InnerBo().new Bi(new Test_InnerAo()).test();
+		new Test_InnerBo().new Bi(new Test_InnerAo()).test();
+		new Test_InnerBo().new Bi(new Test_InnerAo(), true).test();
+		
+		new Test_InnerBo().new Bi(new Test_InnerAo()).new Bii(new Test_InnerAo().new Ai("ai.bii")).test();
+		new Test_InnerBo().new Bi(new Test_InnerAo(), true).new Bii(new Test_InnerAo().new Ai("ai.bii")).test();
+		
+		
+	}
+
+}
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Text.java b/sources/net.sf.j2s.java.core/src/test/Test_Text.java
@@ -0,0 +1,54 @@
+package test;
+
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.FontMetrics;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.font.FontRenderContext;
+import java.awt.font.LineMetrics;
+import java.awt.font.TextLayout;
+import java.awt.geom.Point2D;
+import java.awt.geom.Rectangle2D;
+
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+
+/**
+ * Just produces a listing of font metrics
+ * 
+ * @author hansonr
+ *
+ */
+public class Test_Text extends JFrame {
+
+	
+	Test_Text() {
+		
+		setPreferredSize(new Dimension(300,300));
+		pack();
+		setVisible(true);
+	}
+	
+	public void paint(Graphics g) {
+
+		Graphics2D g2 = (Graphics2D) g;
+		
+		Point2D loc = new Point2D.Double();
+	    Font font = getFont();//Font.getFont("Helvetica-bold-italic");
+	    FontRenderContext frc = g2.getFontRenderContext();
+	    TextLayout layout = new TextLayout("This is a string", font, frc);
+	    layout.draw(g2, (float)loc.getX(), (float)loc.getY());
+	    Rectangle2D bounds = layout.getBounds();
+	    System.out.println(bounds);
+	    System.exit(0);
+	  		
+	}
+	
+	public static void main(String[] args) {
+
+
+		new Test_Text().repaint();
+
+	}
+}
diff --git a/sources/net.sf.j2s.java.core/srcjs/js/j2sClazz.js b/sources/net.sf.j2s.java.core/srcjs/js/j2sClazz.js
@@ -798,6 +798,7 @@ Clazz.newInstance = function (objThis, args, isInner, clazz) {
       b = appendMap({},b);
       isNew = true;
     }
+    b[getClassName(outerObj, true)] = outerObj;
     // add all superclass references for outer object
     addB$Keys(clazz1, isNew, b, outerObj, objThis);
   }
@@ -822,6 +823,11 @@ Clazz.newInstance = function (objThis, args, isInner, clazz) {
 };
 
 
+var fixBRefs = function(cl, obj, outerObj) {
+	// see Clazz.super_
+	obj.b$[cl.superclazz.$this$0] = outerObj;
+}
+
 var stripJavaLang = function(s) {
 	return (
 			s.indexOf("java.lang.") != 0 
@@ -1014,7 +1020,15 @@ Clazz.newPackage = function (pkgName) {
   return Clazz.lastPackage = pkg;
 };
 
-Clazz.super_ = function(cl, obj) {
+Clazz.super_ = function(cl, obj, outerObj) {
+  if (outerObj) {
+	  // inner class is subclassing an inner class in another class using OuterClass.super()
+	  fixBRefs(cl, obj, outerObj);
+	  return;
+  }
+
+  // implicit super() call 
+  
   if (cl.superclazz && cl.superclazz.c$) {
     // added [] here to account for the possibility of vararg default constructor
     cl.superclazz.c$.apply(obj, [[]]);
diff --git a/sources/net.sf.j2s.java.core/srcjs/swingjs2.js b/sources/net.sf.j2s.java.core/srcjs/swingjs2.js
@@ -14739,6 +14739,7 @@ Clazz.newInstance = function (objThis, args, isInner, clazz) {
       b = appendMap({},b);
       isNew = true;
     }
+    b[getClassName(outerObj, true)] = outerObj;
     // add all superclass references for outer object
     addB$Keys(clazz1, isNew, b, outerObj, objThis);
   }
@@ -14763,6 +14764,11 @@ Clazz.newInstance = function (objThis, args, isInner, clazz) {
 };
 
 
+var fixBRefs = function(cl, obj, outerObj) {
+	// see Clazz.super_
+	obj.b$[cl.superclazz.$this$0] = outerObj;
+}
+
 var stripJavaLang = function(s) {
 	return (
 			s.indexOf("java.lang.") != 0 
@@ -14955,7 +14961,15 @@ Clazz.newPackage = function (pkgName) {
   return Clazz.lastPackage = pkg;
 };
 
-Clazz.super_ = function(cl, obj) {
+Clazz.super_ = function(cl, obj, outerObj) {
+  if (outerObj) {
+	  // inner class is subclassing an inner class in another class using OuterClass.super()
+	  fixBRefs(cl, obj, outerObj);
+	  return;
+  }
+
+  // implicit super() call 
+  
   if (cl.superclazz && cl.superclazz.c$) {
     // added [] here to account for the possibility of vararg default constructor
     cl.superclazz.c$.apply(obj, [[]]);
