interface extends interface with duplicate default method

hansonr · hansonr · commit 585c8886204b · 2020-12-12T11:47:01.000-06:00
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Interface.java b/sources/net.sf.j2s.java.core/src/test/Test_Interface.java
@@ -54,4 +54,7 @@ public static void main(String[] args) {
 
 	}
 
+	public default int isTestInterface() {
+		return 0;
+	}
 }
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Interface1.java b/sources/net.sf.j2s.java.core/src/test/Test_Interface1.java
@@ -0,0 +1,8 @@
+package test;
+
+public interface Test_Interface1 extends Test_Interface {
+	@Override
+	public default int isTestInterface() {
+		return 1;
+	}
+}
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Interface2.java b/sources/net.sf.j2s.java.core/src/test/Test_Interface2.java
@@ -1,16 +1,32 @@
 package test;
 
-public class Test_Interface2 implements Test_Interface {
+public class Test_Interface2 extends Test_ implements Test_Interface {
 
 	static int x = 5;
 
+	public static class I0 implements Test_Interface {
+		
+	}
+
+	public static class I1 implements Test_Interface1 {
+		
+	}
+
+	public int isTestInterface() {return 2;}
+	
 	public static void main(String[] args) {
-		ClassLoader.getSystemClassLoader().setClassAssertionStatus("test.Test_Interface", true);
+		
 		System.out.println("in the interface " + x + " " + y + " " + s.length);
-		if (!"5 y".equals(x + " " + y)) 
-			throw new AssertionError();
-		if (Test_Interface3.doTest(3) != 4)
-			throw new AssertionError();
+		assert("5 y".equals(x + " " + y));
+		System.out.println("in the interface " + Test_Interface3.doTest(3));
+		assert(Test_Interface3.doTest(3) == 4);
+
+		// test of public default override
+		assert(new Test_Interface2().isTestInterface() == 2);
+		assert(new I0().isTestInterface() == 0);
+		assert(new I1().isTestInterface() == 1);
+		
+
 		System.out.println("Test_Interface2 OK");
 	}
 
diff --git a/sources/net.sf.j2s.java.core/srcjs/js/j2sClazz.js b/sources/net.sf.j2s.java.core/srcjs/js/j2sClazz.js
@@ -7,6 +7,7 @@
 
 // Google closure compiler cannot handle Clazz.new or Clazz.super
 
+// BH 2020.12.11 fixing interface extended override of interface default
 // BH 2020.12.06 changing Long maxval to 0x1FFFFFFFFFFFFF from 0x20000000000000
 // BH 2020.12.06 better error checking for TYPE.parseTYPE(string)
 // BH 2020.07.27 fix for inner class array names
@@ -1577,6 +1578,7 @@ var excludeSuper = function(o) {
       || o == "$init$"
       || o == "$init0$"
       || o == "$static$"
+      || o == "$defaults$"
       || o == "$clinit$"
       || o == "$classes$"
       || o == "$fields$"
@@ -1607,10 +1609,12 @@ var copyStatics = function(clazzFrom, clazzThis, isInterface) {
 	        clazzThis.prototype[o] = clazzFrom.prototype[o];
 	    }
 	  }
-	  __allowOverwriteClass = false;
-	  if (clazzFrom.$defaults$)
+	  if (clazzFrom.$defaults$) {
+		  __allowOverwriteClass = false;
+		  clazzThis.$defaults$ && clazzThis.$defaults$(clazzThis);
 		  clazzFrom.$defaults$(clazzThis);
-	  __allowOverwriteClass = true;
+		  __allowOverwriteClass = true;
+	  }
   }
 }
 
@@ -5687,7 +5691,7 @@ var caller = arguments.callee.caller;
 var i = 0;
 while (caller.caller) {
 	caller = caller.caller;
-	if (++i > 3 && caller.exClazz)
+	if (++i > 3 && caller.exClazz || caller == Clazz.load)
 		break;
 }
 var superCaller = null;

Original file line number	Diff line number	Diff line change
`@@ -54,4 +54,7 @@ public static void main(String[] args) {`
`54`	`54`
`55`	`55`	`}`
`56`	`56`
	`57`	`+ public default int isTestInterface() {`
	`58`	`+ return 0;`
	`59`	`+ }`
`57`	`60`	`}`