javajs.util.DF (decimal formatter) and PT (parser)

BobHanson · BobHanson · commit 4c2603b49e48 · 2019-11-08T20:55:44.000-06:00
diff --git a/sources/net.sf.j2s.java.core/src/javajs/util/DF.java b/sources/net.sf.j2s.java.core/src/javajs/util/DF.java
@@ -118,6 +118,7 @@ public static String formatDecimal(float value, int decimalDigits) {
       n = PT.parseInt(s1.substring(pt1 + 1));
       // 3.567E-2
       // 0.03567
+      // -0.0001
       s1 = "0." + zeros.substring(0, -n - 1) + s1.substring(0, 1) + s1.substring(2, pt1);
       pt = 1; 
     }
@@ -142,8 +143,11 @@ public static String formatDecimal(float value, int decimalDigits) {
           value + (isNeg ? -1 : 1) * formatAdds[decimalDigits], decimalDigits);
     }
   
-    SB sb = SB.newS(s1.substring(0, (decimalDigits == 0 ? pt
-        : ++pt)));
+    String s0 = s1.substring(0, (decimalDigits == 0 ? pt
+        : ++pt));
+    SB sb = SB.newS(s0);
+    if (isNeg && s0.equals("0.") && decimalDigits + 2 <= len && s1.substring(2, 2 + decimalDigits).equals(zeros.substring(0, decimalDigits)))
+      isNeg = false;
     for (int i = 0; i < decimalDigits; i++, pt++) {
       if (pt < len)
         sb.appendC(s1.charAt(pt));
diff --git a/sources/net.sf.j2s.java.core/src/javajs/util/PT.java b/sources/net.sf.j2s.java.core/src/javajs/util/PT.java
@@ -816,13 +816,12 @@ public static String toJSON(String infoType, Object info) {
     while (true) {
       if (info instanceof String) {
         s = (String) info;
-        /**
-         * @j2sNative
-         * 
-         * if (typeof s == "undefined") s = "null"
-         * 
-         */
-        {}
+//        /**
+//         * @j2sNative
+//         * 
+//         * if (typeof s == "undefined") s = "null"
+//         * 
+//         */
         
         if (s.indexOf("{\"") != 0) {
           //don't doubly fix JSON strings when retrieving status
