Fixed a small problem in JSON class

Andreas Göransson · Andreas Göransson · commit 785ba8f51ede · 2013-03-25T11:29:51.000+01:00
It would not detect an Array because of the tokener having moved forward
once already.
diff --git a/distribution/json4processing-0.1.6/download/json4processing-0.1.6.zip b/distribution/json4processing-0.1.6/download/json4processing-0.1.6.zip
diff --git a/distribution/json4processing-0.1.6/index.html b/distribution/json4processing-0.1.6/index.html
@@ -41,7 +41,7 @@ <h1>json4processing</h1>
 			<div id="about">
 			<h2>json4processing</h2>
 			<p>
-			A library by <a href="##yourLink##">Andreas Goransson</a> for the programming environment <a href="http://www.processing.org" target="_blank">processing</a>. Last update, 03/24/2013.
+			A library by <a href="##yourLink##">Andreas Goransson</a> for the programming environment <a href="http://www.processing.org" target="_blank">processing</a>. Last update, 03/25/2013.
 			</p>
 			<p>
 			Feel free to replace this paragraph with a description of the library. Contributed libraries are developed, documented, and maintained by members of the Processing community. Further directions are included with each library. For feedback and support, please post to the Discourse. We strongly encourage all libraries to be open source, but not all of them are.
diff --git a/distribution/json4processing-0.1.6/reference/allclasses-frame.html b/distribution/json4processing-0.1.6/reference/allclasses-frame.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="sv">
 <head>
-<!-- Generated by javadoc (version 1.7.0_09) on Sun Mar 24 17:21:42 CET 2013 -->
+<!-- Generated by javadoc (version 1.7.0_09) on Mon Mar 25 09:37:36 CET 2013 -->
 <title>All Classes (Javadocs: json4processing)</title>
-<meta name="date" content="2013-03-24">
+<meta name="date" content="2013-03-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 </head>
 <body>
diff --git a/distribution/json4processing-0.1.6/reference/allclasses-noframe.html b/distribution/json4processing-0.1.6/reference/allclasses-noframe.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="sv">
 <head>
-<!-- Generated by javadoc (version 1.7.0_09) on Sun Mar 24 17:21:42 CET 2013 -->
+<!-- Generated by javadoc (version 1.7.0_09) on Mon Mar 25 09:37:36 CET 2013 -->
 <title>All Classes (Javadocs: json4processing)</title>
-<meta name="date" content="2013-03-24">
+<meta name="date" content="2013-03-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 </head>
 <body>
diff --git a/distribution/json4processing-0.1.6/reference/constant-values.html b/distribution/json4processing-0.1.6/reference/constant-values.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="sv">
 <head>
-<!-- Generated by javadoc (version 1.7.0_09) on Sun Mar 24 17:21:42 CET 2013 -->
+<!-- Generated by javadoc (version 1.7.0_09) on Mon Mar 25 09:37:36 CET 2013 -->
 <title>Constant Field Values (Javadocs: json4processing)</title>
-<meta name="date" content="2013-03-24">
+<meta name="date" content="2013-03-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 </head>
 <body>
diff --git a/distribution/json4processing-0.1.6/reference/deprecated-list.html b/distribution/json4processing-0.1.6/reference/deprecated-list.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="sv">
 <head>
-<!-- Generated by javadoc (version 1.7.0_09) on Sun Mar 24 17:21:42 CET 2013 -->
+<!-- Generated by javadoc (version 1.7.0_09) on Mon Mar 25 09:37:36 CET 2013 -->
 <title>Deprecated List (Javadocs: json4processing)</title>
-<meta name="date" content="2013-03-24">
+<meta name="date" content="2013-03-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 </head>
 <body>
diff --git a/distribution/json4processing-0.1.6/reference/help-doc.html b/distribution/json4processing-0.1.6/reference/help-doc.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="sv">
 <head>
-<!-- Generated by javadoc (version 1.7.0_09) on Sun Mar 24 17:21:42 CET 2013 -->
+<!-- Generated by javadoc (version 1.7.0_09) on Mon Mar 25 09:37:36 CET 2013 -->
 <title>API Help (Javadocs: json4processing)</title>
-<meta name="date" content="2013-03-24">
+<meta name="date" content="2013-03-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 </head>
 <body>
diff --git a/distribution/json4processing-0.1.6/reference/index-all.html b/distribution/json4processing-0.1.6/reference/index-all.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="sv">
 <head>
-<!-- Generated by javadoc (version 1.7.0_09) on Sun Mar 24 17:21:42 CET 2013 -->
+<!-- Generated by javadoc (version 1.7.0_09) on Mon Mar 25 09:37:36 CET 2013 -->
 <title>Index (Javadocs: json4processing)</title>
-<meta name="date" content="2013-03-24">
+<meta name="date" content="2013-03-25">
 <link rel="stylesheet" type="text/css" href="./stylesheet.css" title="Style">
 </head>
 <body>
diff --git a/distribution/json4processing-0.1.6/reference/index.html b/distribution/json4processing-0.1.6/reference/index.html
@@ -2,7 +2,7 @@
 <!-- NewPage -->
 <html lang="sv">
 <head>
-<!-- Generated by javadoc on Sun Mar 24 17:21:42 CET 2013 -->
+<!-- Generated by javadoc on Mon Mar 25 09:37:36 CET 2013 -->
 <title>Javadocs: json4processing</title>
 <script type="text/javascript">
     targetPage = "" + window.location.search;
diff --git a/distribution/json4processing-0.1.6/reference/org/json/CDL.html b/distribution/json4processing-0.1.6/reference/org/json/CDL.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="sv">
 <head>
-<!-- Generated by javadoc (version 1.7.0_09) on Sun Mar 24 17:21:41 CET 2013 -->
+<!-- Generated by javadoc (version 1.7.0_09) on Mon Mar 25 09:37:35 CET 2013 -->
 <title>CDL (Javadocs: json4processing)</title>
-<meta name="date" content="2013-03-24">
+<meta name="date" content="2013-03-25">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
diff --git a/distribution/json4processing-0.1.6/reference/org/json/Cookie.html b/distribution/json4processing-0.1.6/reference/org/json/Cookie.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="sv">
 <head>
-<!-- Generated by javadoc (version 1.7.0_09) on Sun Mar 24 17:21:41 CET 2013 -->
+<!-- Generated by javadoc (version 1.7.0_09) on Mon Mar 25 09:37:35 CET 2013 -->
 <title>Cookie (Javadocs: json4processing)</title>
-<meta name="date" content="2013-03-24">
+<meta name="date" content="2013-03-25">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
diff --git a/distribution/json4processing-0.1.6/reference/org/json/CookieList.html b/distribution/json4processing-0.1.6/reference/org/json/CookieList.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="sv">
 <head>
-<!-- Generated by javadoc (version 1.7.0_09) on Sun Mar 24 17:21:41 CET 2013 -->
+<!-- Generated by javadoc (version 1.7.0_09) on Mon Mar 25 09:37:35 CET 2013 -->
 <title>CookieList (Javadocs: json4processing)</title>
-<meta name="date" content="2013-03-24">
+<meta name="date" content="2013-03-25">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
diff --git a/distribution/json4processing-0.1.6/reference/org/json/HTTP.html b/distribution/json4processing-0.1.6/reference/org/json/HTTP.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="sv">
 <head>
-<!-- Generated by javadoc (version 1.7.0_09) on Sun Mar 24 17:21:41 CET 2013 -->
+<!-- Generated by javadoc (version 1.7.0_09) on Mon Mar 25 09:37:35 CET 2013 -->
 <title>HTTP (Javadocs: json4processing)</title>
-<meta name="date" content="2013-03-24">
+<meta name="date" content="2013-03-25">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
diff --git a/distribution/json4processing-0.1.6/reference/org/json/HTTPTokener.html b/distribution/json4processing-0.1.6/reference/org/json/HTTPTokener.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="sv">
 <head>
-<!-- Generated by javadoc (version 1.7.0_09) on Sun Mar 24 17:21:41 CET 2013 -->
+<!-- Generated by javadoc (version 1.7.0_09) on Mon Mar 25 09:37:35 CET 2013 -->
 <title>HTTPTokener (Javadocs: json4processing)</title>
-<meta name="date" content="2013-03-24">
+<meta name="date" content="2013-03-25">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
diff --git a/distribution/json4processing-0.1.6/reference/org/json/JSON.JSONType.html b/distribution/json4processing-0.1.6/reference/org/json/JSON.JSONType.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="sv">
 <head>
-<!-- Generated by javadoc (version 1.7.0_09) on Sun Mar 24 17:21:41 CET 2013 -->
+<!-- Generated by javadoc (version 1.7.0_09) on Mon Mar 25 09:37:36 CET 2013 -->
 <title>JSON.JSONType (Javadocs: json4processing)</title>
-<meta name="date" content="2013-03-24">
+<meta name="date" content="2013-03-25">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
diff --git a/distribution/json4processing-0.1.6/reference/org/json/JSON.html b/distribution/json4processing-0.1.6/reference/org/json/JSON.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="sv">
 <head>
-<!-- Generated by javadoc (version 1.7.0_09) on Sun Mar 24 17:21:41 CET 2013 -->
+<!-- Generated by javadoc (version 1.7.0_09) on Mon Mar 25 09:37:36 CET 2013 -->
 <title>JSON (Javadocs: json4processing)</title>
-<meta name="date" content="2013-03-24">
+<meta name="date" content="2013-03-25">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
diff --git a/distribution/json4processing-0.1.6/reference/org/json/JSONArr.html b/distribution/json4processing-0.1.6/reference/org/json/JSONArr.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="sv">
 <head>
-<!-- Generated by javadoc (version 1.7.0_09) on Sun Mar 24 17:21:42 CET 2013 -->
+<!-- Generated by javadoc (version 1.7.0_09) on Mon Mar 25 09:37:36 CET 2013 -->
 <title>JSONArr (Javadocs: json4processing)</title>
-<meta name="date" content="2013-03-24">
+<meta name="date" content="2013-03-25">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
diff --git a/distribution/json4processing-0.1.6/reference/org/json/JSONException.html b/distribution/json4processing-0.1.6/reference/org/json/JSONException.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="sv">
 <head>
-<!-- Generated by javadoc (version 1.7.0_09) on Sun Mar 24 17:21:42 CET 2013 -->
+<!-- Generated by javadoc (version 1.7.0_09) on Mon Mar 25 09:37:36 CET 2013 -->
 <title>JSONException (Javadocs: json4processing)</title>
-<meta name="date" content="2013-03-24">
+<meta name="date" content="2013-03-25">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
diff --git a/distribution/json4processing-0.1.6/reference/org/json/JSONML.html b/distribution/json4processing-0.1.6/reference/org/json/JSONML.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="sv">
 <head>
-<!-- Generated by javadoc (version 1.7.0_09) on Sun Mar 24 17:21:42 CET 2013 -->
+<!-- Generated by javadoc (version 1.7.0_09) on Mon Mar 25 09:37:36 CET 2013 -->
 <title>JSONML (Javadocs: json4processing)</title>
-<meta name="date" content="2013-03-24">
+<meta name="date" content="2013-03-25">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
diff --git a/distribution/json4processing-0.1.6/reference/org/json/JSONObj.html b/distribution/json4processing-0.1.6/reference/org/json/JSONObj.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="sv">
 <head>
-<!-- Generated by javadoc (version 1.7.0_09) on Sun Mar 24 17:21:42 CET 2013 -->
+<!-- Generated by javadoc (version 1.7.0_09) on Mon Mar 25 09:37:36 CET 2013 -->
 <title>JSONObj (Javadocs: json4processing)</title>
-<meta name="date" content="2013-03-24">
+<meta name="date" content="2013-03-25">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
diff --git a/distribution/json4processing-0.1.6/reference/org/json/JSONString.html b/distribution/json4processing-0.1.6/reference/org/json/JSONString.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="sv">
 <head>
-<!-- Generated by javadoc (version 1.7.0_09) on Sun Mar 24 17:21:42 CET 2013 -->
+<!-- Generated by javadoc (version 1.7.0_09) on Mon Mar 25 09:37:36 CET 2013 -->
 <title>JSONString (Javadocs: json4processing)</title>
-<meta name="date" content="2013-03-24">
+<meta name="date" content="2013-03-25">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
diff --git a/distribution/json4processing-0.1.6/reference/org/json/JSONStringer.html b/distribution/json4processing-0.1.6/reference/org/json/JSONStringer.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="sv">
 <head>
-<!-- Generated by javadoc (version 1.7.0_09) on Sun Mar 24 17:21:42 CET 2013 -->
+<!-- Generated by javadoc (version 1.7.0_09) on Mon Mar 25 09:37:36 CET 2013 -->
 <title>JSONStringer (Javadocs: json4processing)</title>
-<meta name="date" content="2013-03-24">
+<meta name="date" content="2013-03-25">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
diff --git a/distribution/json4processing-0.1.6/reference/org/json/JSONTokener.html b/distribution/json4processing-0.1.6/reference/org/json/JSONTokener.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="sv">
 <head>
-<!-- Generated by javadoc (version 1.7.0_09) on Sun Mar 24 17:21:42 CET 2013 -->
+<!-- Generated by javadoc (version 1.7.0_09) on Mon Mar 25 09:37:36 CET 2013 -->
 <title>JSONTokener (Javadocs: json4processing)</title>
-<meta name="date" content="2013-03-24">
+<meta name="date" content="2013-03-25">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
diff --git a/distribution/json4processing-0.1.6/reference/org/json/JSONWriter.html b/distribution/json4processing-0.1.6/reference/org/json/JSONWriter.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="sv">
 <head>
-<!-- Generated by javadoc (version 1.7.0_09) on Sun Mar 24 17:21:42 CET 2013 -->
+<!-- Generated by javadoc (version 1.7.0_09) on Mon Mar 25 09:37:36 CET 2013 -->
 <title>JSONWriter (Javadocs: json4processing)</title>
-<meta name="date" content="2013-03-24">
+<meta name="date" content="2013-03-25">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
diff --git a/distribution/json4processing-0.1.6/reference/org/json/XML.html b/distribution/json4processing-0.1.6/reference/org/json/XML.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="sv">
 <head>
-<!-- Generated by javadoc (version 1.7.0_09) on Sun Mar 24 17:21:42 CET 2013 -->
+<!-- Generated by javadoc (version 1.7.0_09) on Mon Mar 25 09:37:36 CET 2013 -->
 <title>XML (Javadocs: json4processing)</title>
-<meta name="date" content="2013-03-24">
+<meta name="date" content="2013-03-25">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
diff --git a/distribution/json4processing-0.1.6/reference/org/json/XMLTokener.html b/distribution/json4processing-0.1.6/reference/org/json/XMLTokener.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="sv">
 <head>
-<!-- Generated by javadoc (version 1.7.0_09) on Sun Mar 24 17:21:42 CET 2013 -->
+<!-- Generated by javadoc (version 1.7.0_09) on Mon Mar 25 09:37:36 CET 2013 -->
 <title>XMLTokener (Javadocs: json4processing)</title>
-<meta name="date" content="2013-03-24">
+<meta name="date" content="2013-03-25">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
diff --git a/distribution/json4processing-0.1.6/reference/org/json/package-frame.html b/distribution/json4processing-0.1.6/reference/org/json/package-frame.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="sv">
 <head>
-<!-- Generated by javadoc (version 1.7.0_09) on Sun Mar 24 17:21:42 CET 2013 -->
+<!-- Generated by javadoc (version 1.7.0_09) on Mon Mar 25 09:37:36 CET 2013 -->
 <title>org.json (Javadocs: json4processing)</title>
-<meta name="date" content="2013-03-24">
+<meta name="date" content="2013-03-25">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
diff --git a/distribution/json4processing-0.1.6/reference/org/json/package-summary.html b/distribution/json4processing-0.1.6/reference/org/json/package-summary.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="sv">
 <head>
-<!-- Generated by javadoc (version 1.7.0_09) on Sun Mar 24 17:21:42 CET 2013 -->
+<!-- Generated by javadoc (version 1.7.0_09) on Mon Mar 25 09:37:36 CET 2013 -->
 <title>org.json (Javadocs: json4processing)</title>
-<meta name="date" content="2013-03-24">
+<meta name="date" content="2013-03-25">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
diff --git a/distribution/json4processing-0.1.6/reference/org/json/package-tree.html b/distribution/json4processing-0.1.6/reference/org/json/package-tree.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="sv">
 <head>
-<!-- Generated by javadoc (version 1.7.0_09) on Sun Mar 24 17:21:42 CET 2013 -->
+<!-- Generated by javadoc (version 1.7.0_09) on Mon Mar 25 09:37:36 CET 2013 -->
 <title>org.json Class Hierarchy (Javadocs: json4processing)</title>
-<meta name="date" content="2013-03-24">
+<meta name="date" content="2013-03-25">
 <link rel="stylesheet" type="text/css" href="../../stylesheet.css" title="Style">
 </head>
 <body>
diff --git a/distribution/json4processing-0.1.6/reference/overview-tree.html b/distribution/json4processing-0.1.6/reference/overview-tree.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="sv">
 <head>
-<!-- Generated by javadoc (version 1.7.0_09) on Sun Mar 24 17:21:42 CET 2013 -->
+<!-- Generated by javadoc (version 1.7.0_09) on Mon Mar 25 09:37:36 CET 2013 -->
 <title>Class Hierarchy (Javadocs: json4processing)</title>
-<meta name="date" content="2013-03-24">
+<meta name="date" content="2013-03-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 </head>
 <body>
diff --git a/distribution/json4processing-0.1.6/reference/serialized-form.html b/distribution/json4processing-0.1.6/reference/serialized-form.html
@@ -2,9 +2,9 @@
 <!-- NewPage -->
 <html lang="sv">
 <head>
-<!-- Generated by javadoc (version 1.7.0_09) on Sun Mar 24 17:21:42 CET 2013 -->
+<!-- Generated by javadoc (version 1.7.0_09) on Mon Mar 25 09:37:36 CET 2013 -->
 <title>Serialized Form (Javadocs: json4processing)</title>
-<meta name="date" content="2013-03-24">
+<meta name="date" content="2013-03-25">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 </head>
 <body>
diff --git a/src/org/json/JSON.java b/src/org/json/JSON.java
@@ -108,7 +108,8 @@ public static JSON load(String filename) {
 	
 		JSONTokener tokener = new JSONTokener(input);
 		
-		if (tokener.nextClean() == '{' || tokener.nextClean() == '[') {
+		char next = tokener.nextClean();
+		if (next == '{' || next == '[') {
 			tokener.back();
 			try {
 				return new JSON(tokener);
@@ -123,7 +124,8 @@ public static JSON load(String filename) {
 	public static JSON parse(String data){	
 		JSONTokener tokener = new JSONTokener(data);
 		
-		if (tokener.nextClean() == '{' || tokener.nextClean() == '[') {
+		char next = tokener.nextClean();
+		if (next == '{' || next == '[') {
 			tokener.back();
 			try {
 				return new JSON(tokener);
