Long constructor fix for new Long([r,m,s])

hansonr · hansonr · commit 54babfd8477f · 2021-02-08T07:15:25.000-06:00
diff --git a/sources/net.sf.j2s.java.core/srcjs/js/j2sClazz.js b/sources/net.sf.j2s.java.core/srcjs/js/j2sClazz.js
@@ -1107,7 +1107,7 @@ Clazz.newMeth = function (clazzThis, funName, funBody, modifiers) {
   else 
 	clazzThis.prototype[funName] = funBody;
   return funBody; // allow static calls as though they were not static
-};                     
+};
 
 Clazz.newPackage = function (pkgName) {
   Clazz._Loader && Clazz._Loader.doTODO();
@@ -4071,10 +4071,11 @@ m$(Integer,"decode$S", function(n){
 // Note that Long is problematic in JavaScript 
 
 Clazz._setDeclared("java.lang.Long", java.lang.Long=Long=function(){
-if (arguments[0] === null || typeof arguments[0] != "object")this.c$(arguments[0]);
+	this.c$(arguments[0]);
 });
 
 decorateAsNumber(Long, "Long", "long", "J", lHCOffset);
+
 Long.toString=Long.toString$J=Long.toString$J$I = Long.prototype.toString=function(i, radix){
 	switch(arguments.length) {
 	case 2:
@@ -4085,7 +4086,7 @@ Long.toString=Long.toString$J=Long.toString$J$I = Long.prototype.toString=functi
 		i = this.valueOf();
 		break;
 	}
-	return (i.length ? Long.$s(i) : i);
+	return (i.length ? Long.$s(i) : "" + i);
 };
 
 	
@@ -4884,8 +4885,8 @@ m$(Long,["longValue","longValue$"],function(){return this.valueOf();});
 
 m$(Long,"c$",
 function(v) {
- if (typeof v != "number")
-	v = Long.parseLong$S$I(v, 10);
+	if (typeof v != "number" && typeof v != "object")
+		v = Long.parseLong$S$I(v, 10);
  this.valueOf=function(){return v;};
 }, 1);
 
@@ -4916,7 +4917,7 @@ function(s, radix){
 m$(Long,"valueOf$J",
 function(i){
   i = Clazz.toLong(i);
-  var v = (i.length ? 0 : getCachedNumber(i, longs, Long, "c$$J"));
+  var v = (!i.length || (v = Long.$ival(i)) == Long.$lval(i) && (i = v) == i ? getCachedNumber(i, longs, Long, "c$$J") : 0);
   return (v ? v : Clazz.new_(Long.c$$J, [i]));
 }, 1);
 
