similar

douglascrockford · douglascrockford · commit 7ff3fa4e40cf · 2014-04-21T16:11:51.000-07:00
diff --git a/JSONArray.java b/JSONArray.java
@@ -75,7 +75,7 @@ of this software and associated documentation files (the "Software"), to deal
  * </ul>
  *
  * @author JSON.org
- * @version 2014-04-18
+ * @version 2014-04-21
  */
 public class JSONArray {
 
@@ -813,11 +813,42 @@ public JSONArray put(int index, Object value) throws JSONException {
      *         was no value.
      */
     public Object remove(int index) {
-        Object o = this.opt(index);
-        if (index >= 0 && index < this.length()) {
-            this.myArrayList.remove(index);
+        return index >= 0 && index < this.length()
+            ? this.myArrayList.remove(index)
+            : null;
+    }
+
+    /**
+     * Determine if two JSONArrays are similar.
+     * They must contain similar sequences.
+     *
+     * @param other The other JSONArray
+     * @return true if they are equal
+     */
+    public boolean similar(Object other) {
+        if (!(other instanceof JSONArray)) {
+            return false;
+        }
+        int len = this.length();
+        if (len != ((JSONArray)other).length()) {
+            return false;
+        }
+        for (int i = 0; i < len; i += 1) {
+            Object valueThis = this.get(i);
+            Object valueOther = ((JSONArray)other).get(i);
+            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.equals(valueOther)) {
+                return false;
+            }
         }
-        return o;
+        return true;
     }
 
     /**
diff --git a/JSONObject.java b/JSONObject.java
@@ -90,7 +90,7 @@ of this software and associated documentation files (the "Software"), to deal
  * </ul>
  *
  * @author JSON.org
- * @version 2013-06-17
+ * @version 2014-04-21
  */
 public class JSONObject {
     /**
@@ -1281,6 +1281,46 @@ public Object remove(String key) {
         return this.map.remove(key);
     }
 
+    /**
+     * Determine if two JSONObjects are similar.
+     * They must contain the same set of names which must be associated with
+     * similar values.
+     *
+     * @param other The other JSONObject
+     * @return true if they are equal
+     */
+    public boolean similar(Object other) {
+        try {
+            if (!(other instanceof JSONObject)) {
+                return false;
+            }
+            Set set = this.keySet();
+            if (!set.equals(((JSONObject)other).keySet())) {
+                return false;
+            }
+            Iterator iterator = set.iterator();
+            while (iterator.hasNext()) {
+                String name = (String)iterator.next();
+                Object valueThis = this.get(name);
+                Object valueOther = ((JSONObject)other).get(name);
+                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.equals(valueOther)) {
+                    return false;
+                }
+            }
+            return true;
+        } catch (Throwable exception) {
+            return false;
+        }
+    }
+
     /**
      * Try to convert a string into a number, boolean, or null. If the string
      * can't be converted, return the string.
