more corrections for proper position reports in error messages

Author: johnjaylward

CDL.java

@@ -70,9 +70,12 @@ private static String getValue(JSONTokener x) throws JSONException {
                 c = x.next();
                 if (c == q) {
                     //Handle escaped double-quote
-                    if(x.next() != '\"')
-                    {
-                        x.back();
+                    char nextC = x.next();
+                    if(nextC != '\"') {
+                        // if our quote was the end of the file, don't step 
+                        if(nextC > 0) {
+                            x.back();
+                        }
                         break;
                     }
                 }

JSONTokener.java

@@ -186,7 +186,7 @@ public char next() throws JSONException {
 
             if (c <= 0) { // End of stream
                 this.eof = true;
-                c = 0;
+                return 0;
             }
         }
         this.index += 1;
@@ -214,8 +214,11 @@ public char next() throws JSONException {
     public char next(char c) throws JSONException {
         char n = this.next();
         if (n != c) {
-            throw this.syntaxError("Expected '" + c + "' and instead saw '" +
-                    n + "'");
+            if(n > 0) {
+                throw this.syntaxError("Expected '" + c + "' and instead saw '" +
+                        n + "'");
+            }
+            throw this.syntaxError("Expected '" + c + "' and instead saw ''");
         }
         return n;
     }

XMLTokener.java

@@ -102,7 +102,10 @@ public Object nextContent() throws JSONException {
         }
         sb = new StringBuilder();
         for (;;) {
-            if (c == '<' || c == 0) {
+            if (c == 0) {
+                return sb.toString().trim();
+            }
+            if (c == '<' ) {
                 back();
                 return sb.toString().trim();
             }