altoslib: Improve AltosState save/restore debugging

[fw/altos] / altoslib / AltosParse.java

diff --git a/altoslib/AltosParse.java b/altoslib/AltosParse.java
index 7d832f1ab2e6ce15bdfa8d079b10c1c348490fb9..45ef7dac843cf265e1fb7309136d8a757e1c36e2 100644 (file)
--- a/altoslib/AltosParse.java
+++ b/altoslib/AltosParse.java
@@ -15,10 +15,10 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.AltosLib;
+package org.altusmetrum.altoslib_11;
 
+import java.util.*;
 import java.text.*;
-import java.lang.*;
 
 public class AltosParse {
        public static boolean isdigit(char c) {
@@ -26,6 +26,14 @@ public class AltosParse {
        }
 
        public static int parse_int(String v) throws ParseException {
+               try {
+                       return (int) AltosLib.fromdec(v);
+               } catch (NumberFormatException e) {
+                       throw new ParseException("error parsing int " + v, 0);
+               }
+       }
+
+       public static long parse_long(String v) throws ParseException {
                try {
                        return AltosLib.fromdec(v);
                } catch (NumberFormatException e) {
@@ -41,14 +49,52 @@ public class AltosParse {
                }
        }
 
-       public static double parse_double(String v) throws ParseException {
+       static NumberFormat get_nf_locale() {
+               NumberFormat nf = NumberFormat.getInstance();
+               nf.setParseIntegerOnly(false);
+               nf.setGroupingUsed(false);
+               return nf;
+       }
+
+       static NumberFormat nf_locale = get_nf_locale();
+
+       static NumberFormat get_nf_net() {
+               NumberFormat nf = NumberFormat.getInstance(Locale.ROOT);
+               nf.setParseIntegerOnly(false);
+               nf.setGroupingUsed(false);
+               return nf;
+       }
+
+       static NumberFormat nf_net = get_nf_net();
+
+       public static double parse_double_locale(String str) throws ParseException {
                try {
-                       return Double.parseDouble(v);
-               } catch (NumberFormatException e) {
-                       throw new ParseException("error parsing double " + v, 0);
+                       return nf_locale.parse(str.trim()).doubleValue();
+               } catch (ParseException pe) {
+                       throw new ParseException("error parsing double " + str, 0);
+               }
+       }
+
+       public static String format_double_locale(double number) {
+               return nf_locale.format(number);
+       }
+
+       public static double parse_double_net(String str) throws ParseException {
+               try {
+                       String t = str.trim();
+//                     System.out.printf("Parse string \"%s\" trim \"%s\"\n", str, t);
+                       return nf_net.parse(t).doubleValue();
+               } catch (ParseException pe) {
+                       throw new ParseException("error parsing double " + str, 0);
                }
        }
 
+       public static String format_double_net(double number) {
+               String ret = nf_net.format(number);
+//             System.out.printf("format double %f \"%s\"\n", number, ret);
+               return ret;
+       }
+
        public static double parse_coord(String coord) throws ParseException {
                String[]        dsf = coord.split("\\D+");