diff --git a/src/main/java/org/json/JSONArray.java b/src/main/java/org/json/JSONArray.java index 7d12f98..2a3c553 100644 --- a/src/main/java/org/json/JSONArray.java +++ b/src/main/java/org/json/JSONArray.java @@ -118,41 +118,7 @@ public class JSONArray implements Iterable { x.back(); this.myArrayList.add(x.nextValue()); } - switch (x.nextClean()) { - case 0: - // array is unclosed. No ']' found, instead EOF - throw x.syntaxError("Expected a ',' or ']'"); - case ',': - nextChar = x.nextClean(); - if (nextChar == 0) { - // array is unclosed. No ']' found, instead EOF - throw x.syntaxError("Expected a ',' or ']'"); - } - if (nextChar == ']') { - // trailing commas are not allowed in strict mode - if (jsonParserConfiguration.isStrictMode()) { - throw x.syntaxError("Strict mode error: Expected another array element"); - } - return; - } - if (nextChar == ',') { - // consecutive commas are not allowed in strict mode - if (jsonParserConfiguration.isStrictMode()) { - throw x.syntaxError("Strict mode error: Expected a valid array element"); - } - return; - } - x.back(); - break; - case ']': - if (isInitial && jsonParserConfiguration.isStrictMode() && - x.nextClean() != 0) { - throw x.syntaxError("Strict mode error: Unparsed characters found at end of input text"); - } - return; - default: - throw x.syntaxError("Expected a ',' or ']'"); - } + if (checkForSyntaxError(x, jsonParserConfiguration, isInitial)) return; } } else { if (isInitial && jsonParserConfiguration.isStrictMode() && x.nextClean() != 0) { @@ -161,6 +127,52 @@ public class JSONArray implements Iterable { } } + /** Convenience function. Checks for JSON syntax error. + * @param x A JSONTokener instance from which the JSONArray is constructed. + * @param jsonParserConfiguration A JSONParserConfiguration instance that controls the behavior of the parser. + * @param isInitial Boolean indicating position of char + * @return + */ + private static boolean checkForSyntaxError(JSONTokener x, JSONParserConfiguration jsonParserConfiguration, boolean isInitial) { + char nextChar; + switch (x.nextClean()) { + case 0: + // array is unclosed. No ']' found, instead EOF + throw x.syntaxError("Expected a ',' or ']'"); + case ',': + nextChar = x.nextClean(); + if (nextChar == 0) { + // array is unclosed. No ']' found, instead EOF + throw x.syntaxError("Expected a ',' or ']'"); + } + if (nextChar == ']') { + // trailing commas are not allowed in strict mode + if (jsonParserConfiguration.isStrictMode()) { + throw x.syntaxError("Strict mode error: Expected another array element"); + } + return true; + } + if (nextChar == ',') { + // consecutive commas are not allowed in strict mode + if (jsonParserConfiguration.isStrictMode()) { + throw x.syntaxError("Strict mode error: Expected a valid array element"); + } + return true; + } + x.back(); + break; + case ']': + if (isInitial && jsonParserConfiguration.isStrictMode() && + x.nextClean() != 0) { + throw x.syntaxError("Strict mode error: Unparsed characters found at end of input text"); + } + return true; + default: + throw x.syntaxError("Expected a ',' or ']'"); + } + return false; + } + /** * Construct a JSONArray from a source JSON text. * @@ -735,11 +747,7 @@ public class JSONArray implements Iterable { if (val == null) { return defaultValue; } - final double doubleValue = val.doubleValue(); - // if (Double.isNaN(doubleValue) || Double.isInfinite(doubleValue)) { - // return defaultValue; - // } - return doubleValue; + return val.doubleValue(); } /** @@ -771,11 +779,7 @@ public class JSONArray implements Iterable { if (val == null) { return defaultValue; } - final Double doubleValue = val.doubleValue(); - // if (Double.isNaN(doubleValue) || Double.isInfinite(doubleValue)) { - // return defaultValue; - // } - return doubleValue; + return val.doubleValue(); } /** @@ -807,11 +811,7 @@ public class JSONArray implements Iterable { if (val == null) { return defaultValue; } - final float floatValue = val.floatValue(); - // if (Float.isNaN(floatValue) || Float.isInfinite(floatValue)) { - // return floatValue; - // } - return floatValue; + return val.floatValue(); } /** @@ -843,11 +843,7 @@ public class JSONArray implements Iterable { if (val == null) { return defaultValue; } - final Float floatValue = val.floatValue(); - // if (Float.isNaN(floatValue) || Float.isInfinite(floatValue)) { - // return floatValue; - // } - return floatValue; + return val.floatValue(); } /** @@ -1645,29 +1641,44 @@ public class JSONArray implements Iterable { if(valueThis == null) { return false; } - if (valueThis instanceof JSONObject) { - if (!((JSONObject)valueThis).similar(valueOther)) { - return false; - } - } else if (valueThis instanceof JSONArray) { - if (!((JSONArray)valueThis).similar(valueOther)) { - return false; - } - } else if (valueThis instanceof Number && valueOther instanceof Number) { - if (!JSONObject.isNumberSimilar((Number)valueThis, (Number)valueOther)) { - return false; - } - } else if (valueThis instanceof JSONString && valueOther instanceof JSONString) { - if (!((JSONString) valueThis).toJSONString().equals(((JSONString) valueOther).toJSONString())) { - return false; - } - } else if (!valueThis.equals(valueOther)) { + if (!isSimilar(valueThis, valueOther)) { return false; } } return true; } + /** + * Convenience function; checks for object similarity + * @param valueThis + * Initial object to compare + * @param valueOther + * Comparison object + * @return boolean + */ + private boolean isSimilar(Object valueThis, Object valueOther) { + if (valueThis instanceof JSONObject) { + if (!((JSONObject)valueThis).similar(valueOther)) { + return false; + } + } else if (valueThis instanceof JSONArray) { + if (!((JSONArray)valueThis).similar(valueOther)) { + return false; + } + } else if (valueThis instanceof Number && valueOther instanceof Number) { + if (!JSONObject.isNumberSimilar((Number)valueThis, (Number)valueOther)) { + return false; + } + } else if (valueThis instanceof JSONString && valueOther instanceof JSONString) { + if (!((JSONString) valueThis).toJSONString().equals(((JSONString) valueOther).toJSONString())) { + return false; + } + } else if (!valueThis.equals(valueOther)) { + return false; + } + return true; + } + /** * Produce a JSONObject by combining a JSONArray of names with the values of * this JSONArray. @@ -1799,12 +1810,7 @@ public class JSONArray implements Iterable { writer.write('['); if (length == 1) { - try { - JSONObject.writeValue(writer, this.myArrayList.get(0), - indentFactor, indent); - } catch (Exception e) { - throw new JSONException("Unable to write JSONArray value at index: 0", e); - } + writeArrayAttempt(writer, indentFactor, indent, 0); } else if (length != 0) { final int newIndent = indent + indentFactor; @@ -1816,12 +1822,7 @@ public class JSONArray implements Iterable { writer.write('\n'); } JSONObject.indent(writer, newIndent); - try { - JSONObject.writeValue(writer, this.myArrayList.get(i), - indentFactor, newIndent); - } catch (Exception e) { - throw new JSONException("Unable to write JSONArray value at index: " + i, e); - } + writeArrayAttempt(writer, indentFactor, newIndent, i); needsComma = true; } if (indentFactor > 0) { @@ -1836,6 +1837,26 @@ public class JSONArray implements Iterable { } } + /** + * Convenience function. Attempts to write + * @param writer + * Writes the serialized JSON + * @param indentFactor + * The number of spaces to add to each level of indentation. + * @param indent + * The indentation of the top level. + * @param i + * Index in array to be added + */ + private void writeArrayAttempt(Writer writer, int indentFactor, int indent, int i) { + try { + JSONObject.writeValue(writer, this.myArrayList.get(i), + indentFactor, indent); + } catch (Exception e) { + throw new JSONException("Unable to write JSONArray value at index: " + i, e); + } + } + /** * Returns a java.util.List containing all of the elements in this array. * If an element in the array is a JSONArray or JSONObject it will also