Skip to content

Commit f075dbe

Browse files
committed
3.2.6 transpiler and runtime upgrade
1 parent 2338a2a commit f075dbe

File tree

8 files changed

+12
-3
lines changed

8 files changed

+12
-3
lines changed
-5.24 MB
Binary file not shown.
54 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20191229202156
1+
20200101112831
-5.24 MB
Binary file not shown.
54 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20191229202156
1+
20200101112831
-5.24 MB
Binary file not shown.

sources/net.sf.j2s.java.core/srcjs/swingjs2.js

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13864,6 +13864,7 @@ if (ev.keyCode == 9 && ev.target["data-focuscomponent"]) {
1386413864

1386513865
// Google closure compiler cannot handle Clazz.new or Clazz.super
1386613866

13867+
// BH 2019.12.29 3.2.6 fixes Float.parseFloat$S("NaN") [and Double]
1386713868
// BH 2019.12.23 3.2.6 update of System
1386813869
// BH 2019.12.19 3.2.6 revision of $clinit$
1386913870
// BH 2019.12.16 3.2.5.v4 adds ClassLoader static methods for system resources (just j2s/...)
@@ -13923,7 +13924,7 @@ Clazz.ClassFilesLoaded = [];
1392313924
Clazz.popup = Clazz.log = Clazz.error = window.alert;
1392413925

1392513926
/* can be set by page JavaScript */
13926-
Clazz.defaultAssertionStatus = true;
13927+
Clazz.defaultAssertionStatus = false;
1392713928

1392813929
/* can be set by page JavaScript */
1392913930
Clazz._assertFunction = null;
@@ -17316,6 +17317,8 @@ if (typeof arguments[0] != "object")this.c$(arguments[0]);
1731617317
var primTypes = {};
1731717318

1731817319
var FALSE = function() { return false };
17320+
var EMPTY_CLASSES = function() {return Clazz.array(Class, [0])};
17321+
var NULL_FUNC = function() {return null};
1731917322

1732017323
var setJ2STypeclass = function(cl, type, paramCode) {
1732117324
// TODO -- should be a proper Java.lang.Class
@@ -17330,6 +17333,8 @@ var setJ2STypeclass = function(cl, type, paramCode) {
1733017333
cl.TYPE.toString = cl.TYPE.getName$ = cl.TYPE.getTypeName$
1733117334
= cl.TYPE.getCanonicalName$ = cl.TYPE.getSimpleName$ = function() {return type};
1733217335
cl.TYPE.isAssignableFrom$Class = (function(t) {return function(c) {return c == t}})(cl.TYPE);
17336+
cl.TYPE.getSuperclass$ = NULL_FUNC;
17337+
cl.TYPE.getInterfaces$ = EMPTY_CLASSES;
1733317338
}
1733417339

1733517340
var decorateAsNumber = function (clazz, qClazzName, type, PARAMCODE) {
@@ -17763,6 +17768,8 @@ if(s==null){
1776317768
throw Clazz.new_(NumberFormatException.c$$S, ["null"]);
1776417769
}
1776517770
if (typeof s == "number")return s; // important -- typeof NaN is "number" and is OK here
17771+
if (s == "NaN")
17772+
return NaN;
1776617773
var floatVal=Number(s);
1776717774
if(isNaN(floatVal)){
1776817775
throw Clazz.new_(NumberFormatException.c$$S, ["Not a Number : "+s]);
@@ -17835,6 +17842,8 @@ if(s==null){
1783517842
throw Clazz.new_(NumberFormatException.c$$S, ["null"]);
1783617843
}
1783717844
if (typeof s == "number")return s; // important -- typeof NaN is "number" and is OK here
17845+
if (s == "NaN")
17846+
return NaN;
1783817847
var doubleVal=Number(s);
1783917848
if(isNaN(doubleVal)){
1784017849
throw Clazz.new_(NumberFormatException.c$$S, ["Not a Number : "+s]);

0 commit comments

Comments
 (0)