altoslib: Add construction for remaining primitive array types to JSON

[fw/altos] / altoslib / AltosJson.java

diff --git a/altoslib/AltosJson.java b/altoslib/AltosJson.java
index 6ae7e7dc99de1278f8529bbc64d7d4553d5b8589..80d83e48c94c89cb9621d327a04b56dcff543910 100644 (file)
--- a/altoslib/AltosJson.java
+++ b/altoslib/AltosJson.java
@@ -280,6 +280,9 @@ class JsonLexer extends JsonUtil {
        static keyword[] keywords = {
                new keyword("true", new JsonToken(JsonToken._boolean, true)),
                new keyword("false", new JsonToken(JsonToken._boolean, false)),
+               new keyword("NegInfinity", new JsonToken(JsonToken._double, Double.NEGATIVE_INFINITY)),
+               new keyword("Infinity", new JsonToken(JsonToken._double, Double.POSITIVE_INFINITY)),
+               new keyword("NaN", new JsonToken(JsonToken._double, Double.NaN))
        };
 
        static JsonToken keyword(String word) {
@@ -583,10 +586,19 @@ public class AltosJson extends JsonUtil {
                        array.append_array(result, indent, pretty);
                        break;
                case type_double:
-                       String dval = nf_json.format(d_number);
-                       if (dval.equals("-0"))
-                               dval = "0";
-                       result.append(dval);
+                       if (Double.isInfinite(d_number)) {
+                               if (d_number < 0)
+                                       result.append("NegInfinity");
+                               else
+                                       result.append("Infinity");
+                       } else if (Double.isNaN(d_number)) {
+                               result.append("NaN");
+                       } else {
+                               String dval = nf_json.format(d_number);
+                               if (dval.equals("-0"))
+                                       dval = "0";
+                               result.append(dval);
+                       }
                        break;
                case type_long:
                        result.append(new Long(l_number).toString());
@@ -1000,7 +1012,32 @@ public class AltosJson extends JsonUtil {
                        assert_array(false);
 
                        Class element_class = c.getComponentType();
-                       if (element_class == Double.TYPE) {
+                       if (element_class == Boolean.TYPE) {
+                               boolean[] array = (boolean[]) Array.newInstance(element_class, size());
+                               for (int i = 0; i < array.length; i++)
+                                       array[i] = (Boolean) get(i).make(element_class);
+                               ret = array;
+                       } else if (element_class == Byte.TYPE) {
+                               byte[] array = (byte[]) Array.newInstance(element_class, size());
+                               for (int i = 0; i < array.length; i++)
+                                       array[i] = (Byte) get(i).make(element_class);
+                               ret = array;
+                       } else if (element_class == Character.TYPE) {
+                               char[] array = (char[]) Array.newInstance(element_class, size());
+                               for (int i = 0; i < array.length; i++)
+                                       array[i] = (Character) get(i).make(element_class);
+                               ret = array;
+                       } else if (element_class == Integer.TYPE) {
+                               int[] array = (int[]) Array.newInstance(element_class, size());
+                               for (int i = 0; i < array.length; i++)
+                                       array[i] = (Integer) get(i).make(element_class);
+                               ret = array;
+                       } else if (element_class == Long.TYPE) {
+                               long[] array = (long[]) Array.newInstance(element_class, size());
+                               for (int i = 0; i < array.length; i++)
+                                       array[i] = (Long) get(i).make(element_class);
+                               ret = array;
+                       } else if (element_class == Double.TYPE) {
                                double[] array = (double[]) Array.newInstance(element_class, size());
                                for (int i = 0; i < array.length; i++)
                                        array[i] = (Double) get(i).make(element_class);
@@ -1030,7 +1067,6 @@ public class AltosJson extends JsonUtil {
                                        for (Field field : c.getDeclaredFields()) {
                                                String  fieldName = field.getName();
                                                Class   fieldClass = field.getType();
-                                               String  className = fieldClass.getName();
 
                                                if (Modifier.isStatic(field.getModifiers()))
                                                        continue;
@@ -1165,8 +1201,6 @@ public class AltosJson extends JsonUtil {
                        for (Class c = object.getClass(); c != null; c = c.getSuperclass()) {
                                for (Field field : c.getDeclaredFields()) {
                                        String  fieldName = field.getName();
-                                       Class   fieldClass = field.getType();
-                                       String  className = fieldClass.getName();
 
                                        /* Skip static fields */
                                        if (Modifier.isStatic(field.getModifiers()))