ClassLoader elaborated for assertion

BobHanson · BobHanson · commit 24f811aa5808 · 2017-09-22T04:24:11.000-05:00
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/ASTKeywordVisitor.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/ASTKeywordVisitor.java
@@ -163,17 +163,23 @@ public class ASTKeywordVisitor extends ASTEmptyVisitor {
 	class StaticBuffer {
 		private StringBuffer buf;
 		private String added = "";
-		public StaticBuffer() {
+		
+		boolean hasAssert;
+		
+		StaticBuffer() {
 			buf = new StringBuffer();
 		}
-		public StaticBuffer append(String s) {
+		
+		StaticBuffer append(String s) {
 			buf.append(s);
 			return this;
 		}
+		
 		public String toString() {
-			return added + buf;
+			return (hasAssert ? "C$.$_ASSERT_ENABLED_ = ClassLoader.$getClassAssertionStatus(C$);\r\n" : "") + added + buf;
 		}
-		public void addType(String name) {
+		
+		void addType(String name) {
 			char a = name.charAt(0);
 			// note that this character may not be in the phrase "new Int Array"
 			if (added.indexOf(a) >= 0)
diff --git a/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/ASTScriptVisitor.java b/sources/net.sf.j2s.core/src/net/sf/j2s/core/astvisitors/ASTScriptVisitor.java
@@ -369,6 +369,7 @@ public boolean visit(AssertStatement node) {
 			msg.accept(this);
 		}
 		buffer.append("});\r\n");
+		staticFieldDefBuffer.hasAssert = true;
 		return false;
 	}
 
diff --git a/sources/net.sf.j2s.core/test/dev/js/j2sSwingJS.js b/sources/net.sf.j2s.core/test/dev/js/j2sSwingJS.js
@@ -977,7 +977,7 @@ var extendObject = function(clazz) {
   // BH allows @j2sNative access without super constructor
   Clazz.clone = function(me) { 
     return appendMap(me.__ARRAYTYPE ? Clazz.newArray$(me.__BASECLASS, me.__ARRAYTYPE, -1, [-2, me])
-     : new me.constructor([Clazz.inheritArgs]), me); 
+     : new me.constructor(Clazz.inheritArgs), me); 
   }
 /*
  * Methods for thread in Object

Original file line number	Diff line number	Diff line change
`@@ -369,6 +369,7 @@ public boolean visit(AssertStatement node) {`
`369`	`369`	`msg.accept(this);`
`370`	`370`	`}`
`371`	`371`	`buffer.append("});\r\n");`
	`372`	`+ staticFieldDefBuffer.hasAssert = true;`
`372`	`373`	`return false;`
`373`	`374`	`}`
`374`	`375`
Original file line number	Diff line number	Diff line change
`@@ -977,7 +977,7 @@ var extendObject = function(clazz) {`
`977`	`977`	`// BH allows @j2sNative access without super constructor`
`978`	`978`	`Clazz.clone = function(me) {`
`979`	`979`	`return appendMap(me.__ARRAYTYPE ? Clazz.newArray$(me.__BASECLASS, me.__ARRAYTYPE, -1, [-2, me])`
`980`		`- : new me.constructor([Clazz.inheritArgs]), me);`
	`980`	`+ : new me.constructor(Clazz.inheritArgs), me);`
`981`	`981`	`}`
`982`	`982`	`/*`
`983`	`983`	`* Methods for thread in Object`