// BH 2019.12.29 3.2.6 fixes Float.parseFloat$S("NaN") [and Double]

BobHanson · BobHanson · commit c41d2c064c08 · 2020-01-01T11:39:25.000-06:00
better, but not perfect, primitive TYPE class methods.
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 2019.12.29 3.2.6 fixes Float.parseFloat$S("NaN") [and Double]
 // BH 2019.12.23 3.2.6 update of System
 // BH 2019.12.19 3.2.6 revision of $clinit$
 // BH 2019.12.16 3.2.5.v4 adds ClassLoader static methods for system resources (just j2s/...)
@@ -66,7 +67,7 @@ Clazz.ClassFilesLoaded = [];
 Clazz.popup = Clazz.log = Clazz.error = window.alert;
 
 /* can be set by page JavaScript */
-Clazz.defaultAssertionStatus = true;
+Clazz.defaultAssertionStatus = false;
 
 /* can be set by page JavaScript */
 Clazz._assertFunction = null;
@@ -3459,6 +3460,8 @@ if (typeof arguments[0] != "object")this.c$(arguments[0]);
 var primTypes = {};
 
 var FALSE = function() { return false };
+var EMPTY_CLASSES = function() {return Clazz.array(Class, [0])};
+var NULL_FUNC = function() {return null};
 
 var setJ2STypeclass = function(cl, type, paramCode) {
 // TODO -- should be a proper Java.lang.Class
@@ -3473,6 +3476,8 @@ var setJ2STypeclass = function(cl, type, paramCode) {
   cl.TYPE.toString = cl.TYPE.getName$ = cl.TYPE.getTypeName$ 
     = cl.TYPE.getCanonicalName$ = cl.TYPE.getSimpleName$ = function() {return type};
   cl.TYPE.isAssignableFrom$Class = (function(t) {return function(c) {return c == t}})(cl.TYPE);
+  cl.TYPE.getSuperclass$ = NULL_FUNC;
+  cl.TYPE.getInterfaces$ = EMPTY_CLASSES;
 }
 
 var decorateAsNumber = function (clazz, qClazzName, type, PARAMCODE) {
@@ -3906,6 +3911,8 @@ if(s==null){
 throw Clazz.new_(NumberFormatException.c$$S, ["null"]);
 }
 if (typeof s == "number")return s;  // important -- typeof NaN is "number" and is OK here
+if (s == "NaN")
+	return NaN;
 var floatVal=Number(s);
 if(isNaN(floatVal)){
 throw Clazz.new_(NumberFormatException.c$$S, ["Not a Number : "+s]);
@@ -3978,6 +3985,8 @@ if(s==null){
   throw Clazz.new_(NumberFormatException.c$$S, ["null"]);
 }
 if (typeof s == "number")return s;  // important -- typeof NaN is "number" and is OK here
+if (s == "NaN")
+	return NaN;
 var doubleVal=Number(s);
 if(isNaN(doubleVal)){
 throw Clazz.new_(NumberFormatException.c$$S, ["Not a Number : "+s]);
