Revert "Merge pull request stleary#888 from rikkarth/fix/887"

This reverts commit 14f7127, reversing
changes made to 054786e.

Author: Sean Leary

src/main/java/org/json/JSONArray.java

@@ -96,83 +96,53 @@ public JSONArray(JSONTokener x) throws JSONException {
      */
     public JSONArray(JSONTokener x, JSONParserConfiguration jsonParserConfiguration) throws JSONException {
         this();
-        char nextChar = x.nextClean();
-
-        // check first character, if not '[' throw JSONException
-        if (nextChar != '[') {
+        if (x.nextClean() != '[') {
             throw x.syntaxError("A JSONArray text must start with '['");
         }
 
-        parseTokener(x, jsonParserConfiguration); // runs recursively
-
-    }
-
-    private void parseTokener(JSONTokener x, JSONParserConfiguration jsonParserConfiguration) {
-        boolean strictMode = jsonParserConfiguration.isStrictMode();
-
-        char cursor = x.nextClean();
-
-        switch (cursor) {
-            case 0:
-                throwErrorIfEoF(x);
-                break;
-            case ',':
-                cursor = x.nextClean();
-
-                throwErrorIfEoF(x);
-
-                if(strictMode && cursor == ']'){
-                    throw x.syntaxError(getInvalidCharErrorMsg(cursor));
-                }
-
-                if (cursor == ']') {
-                    break;
-                }
-
-                x.back();
-
-                parseTokener(x, jsonParserConfiguration);
-                break;
-            case ']':
-                if (strictMode) {
-                    cursor = x.nextClean();
-                    boolean isEoF = x.end();
-
-                    if (isEoF) {
-                        break;
-                    }
-
-                    if (x.getArrayLevel() == 0) {
-                        throw x.syntaxError(getInvalidCharErrorMsg(cursor));
-                    }
-
+        char nextChar = x.nextClean();
+        if (nextChar == 0) {
+            // array is unclosed. No ']' found, instead EOF
+            throw x.syntaxError("Expected a ',' or ']'");
+        }
+        if (nextChar != ']') {
+            x.back();
+            for (;;) {
+                if (x.nextClean() == ',') {
+                    x.back();
+                    this.myArrayList.add(JSONObject.NULL);
+                } else {
                     x.back();
+                    this.myArrayList.add(x.nextValue(jsonParserConfiguration));
                 }
-                break;
-            default:
-                x.back();
-                boolean currentCharIsQuote = x.getPrevious() == '"';
-                boolean quoteIsNotNextToValidChar = x.getPreviousChar() != ',' && x.getPreviousChar() != '[';
-
-                if (strictMode && currentCharIsQuote && quoteIsNotNextToValidChar) {
-                    throw x.syntaxError(getInvalidCharErrorMsg(cursor));
+                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 == ']') {
+                            return;
+                        }
+                        x.back();
+                        break;
+                    case ']':
+                        if (jsonParserConfiguration.isStrictMode()) {
+                            nextChar = x.nextClean();
+                            if (nextChar != 0) {
+                                throw x.syntaxError("invalid character found after end of array: " + nextChar);
+                            }
+                        }
+
+                        return;
+                    default:
+                        throw x.syntaxError("Expected a ',' or ']'");
                 }
-
-                this.myArrayList.add(x.nextValue(jsonParserConfiguration));
-                parseTokener(x, jsonParserConfiguration);
-        }
-    }
-
-    /**
-     * Throws JSONException if JSONTokener has reached end of file, usually when array is unclosed. No ']' found,
-     * instead EoF.
-     *
-     * @param x the JSONTokener being evaluated.
-     * @throws JSONException if JSONTokener has reached end of file.
-     */
-    private void throwErrorIfEoF(JSONTokener x) {
-        if (x.end()) {
-            throw x.syntaxError(String.format("Expected a ',' or ']' but instead found '%s'", x.getPrevious()));
+            }
         }
     }
 
@@ -1962,7 +1932,6 @@ private void addAll(Object array, boolean wrap) throws JSONException {
     private void addAll(Object array, boolean wrap, int recursionDepth) {
         addAll(array, wrap, recursionDepth, new JSONParserConfiguration());
     }
-
     /**
      * Add an array's elements to the JSONArray.
      *`
@@ -2009,6 +1978,7 @@ private void addAll(Object array, boolean wrap, int recursionDepth, JSONParserCo
                     "JSONArray initial value should be a string or collection or array.");
         }
     }
+
     /**
      * Create a new JSONException in a common format for incorrect conversions.
      * @param idx index of the item
@@ -2037,7 +2007,4 @@ private static JSONException wrongValueFormatException(
                 , cause);
     }
 
-    private static String getInvalidCharErrorMsg(char cursor) {
-        return String.format("invalid character '%s' found after end of array", cursor);
-    }
 }