More formatting

By: Dinnerbone <dinnerbone@dinnerbone.com>
This commit is contained in:
Bukkit/Spigot 2011-01-03 15:35:30 +00:00
parent 346e41a6e5
commit 05b2a299c0
12 changed files with 2190 additions and 2184 deletions

View File

@ -15,133 +15,136 @@ import java.util.StringTokenizer;
* @author FangYidong<fangyidong@yahoo.com.cn> * @author FangYidong<fangyidong@yahoo.com.cn>
*/ */
public class ItemList { public class ItemList {
private String sp=","; private String sp = ",";
List items=new ArrayList(); List items = new ArrayList();
public ItemList() {
}
public ItemList(){} public ItemList(String s) {
this.split(s, sp, items);
}
public ItemList(String s, String sp) {
this.sp = s;
this.split(s, sp, items);
}
public ItemList(String s){ public ItemList(String s, String sp, boolean isMultiToken) {
this.split(s,sp,items); split(s, sp, items, isMultiToken);
} }
public ItemList(String s,String sp){ public List getItems() {
this.sp=s; return this.items;
this.split(s,sp,items); }
}
public ItemList(String s,String sp,boolean isMultiToken){ public String[] getArray() {
split(s,sp,items,isMultiToken); return (String[]) this.items.toArray();
} }
public List getItems(){ public void split(String s, String sp, List append, boolean isMultiToken) {
return this.items; if (s == null || sp == null) {
} return;
}
if (isMultiToken) {
StringTokenizer tokens = new StringTokenizer(s, sp);
while (tokens.hasMoreTokens()) {
append.add(tokens.nextToken().trim());
}
} else {
this.split(s, sp, append);
}
}
public String[] getArray(){ public void split(String s, String sp, List append) {
return (String[])this.items.toArray(); if (s == null || sp == null) {
} return;
}
int pos = 0;
int prevPos = 0;
do {
prevPos = pos;
pos = s.indexOf(sp, pos);
if (pos == -1) {
break;
}
append.add(s.substring(prevPos, pos).trim());
pos += sp.length();
} while (pos != -1);
append.add(s.substring(prevPos).trim());
}
public void split(String s,String sp,List append,boolean isMultiToken){ public void setSP(String sp) {
if(s==null || sp==null) this.sp = sp;
return; }
if(isMultiToken){
StringTokenizer tokens=new StringTokenizer(s,sp);
while(tokens.hasMoreTokens()){
append.add(tokens.nextToken().trim());
}
}
else{
this.split(s,sp,append);
}
}
public void split(String s,String sp,List append){ public void add(int i, String item) {
if(s==null || sp==null) if (item == null) {
return; return;
int pos=0; }
int prevPos=0; items.add(i, item.trim());
do{ }
prevPos=pos;
pos=s.indexOf(sp,pos);
if(pos==-1)
break;
append.add(s.substring(prevPos,pos).trim());
pos+=sp.length();
}while(pos!=-1);
append.add(s.substring(prevPos).trim());
}
public void setSP(String sp){ public void add(String item) {
this.sp=sp; if (item == null) {
} return;
}
items.add(item.trim());
}
public void add(int i,String item){ public void addAll(ItemList list) {
if(item==null) items.addAll(list.items);
return; }
items.add(i,item.trim());
}
public void add(String item){ public void addAll(String s) {
if(item==null) this.split(s, sp, items);
return; }
items.add(item.trim());
}
public void addAll(ItemList list){ public void addAll(String s, String sp) {
items.addAll(list.items); this.split(s, sp, items);
} }
public void addAll(String s){ public void addAll(String s, String sp, boolean isMultiToken) {
this.split(s,sp,items); this.split(s, sp, items, isMultiToken);
} }
public void addAll(String s,String sp){ /**
this.split(s,sp,items); * @param i 0-based
} * @return
*/
public String get(int i) {
return (String) items.get(i);
}
public void addAll(String s,String sp,boolean isMultiToken){ public int size() {
this.split(s,sp,items,isMultiToken); return items.size();
} }
/** public String toString() {
* @param i 0-based return toString(sp);
* @return }
*/
public String get(int i){
return (String)items.get(i);
}
public int size(){ public String toString(String sp) {
return items.size(); StringBuffer sb = new StringBuffer();
}
public String toString(){ for (int i = 0; i < items.size(); i++) {
return toString(sp); if (i == 0) {
} sb.append(items.get(i));
} else {
sb.append(sp);
sb.append(items.get(i));
}
}
return sb.toString();
public String toString(String sp){ }
StringBuffer sb=new StringBuffer();
for(int i=0;i<items.size();i++){ public void clear() {
if(i==0) items.clear();
sb.append(items.get(i)); }
else{
sb.append(sp);
sb.append(items.get(i));
}
}
return sb.toString();
} public void reset() {
sp = ",";
public void clear(){ items.clear();
items.clear(); }
}
public void reset(){
sp=",";
items.clear();
}
} }

View File

@ -10,14 +10,13 @@ import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
/** /**
* A JSON array. JSONObject supports java.util.List interface. * A JSON array. JSONObject supports java.util.List interface.
* *
* @author FangYidong<fangyidong@yahoo.com.cn> * @author FangYidong<fangyidong@yahoo.com.cn>
*/ */
public class JSONArray extends ArrayList implements List, JSONAware, JSONStreamAware { public class JSONArray extends ArrayList implements List, JSONAware, JSONStreamAware {
private static final long serialVersionUID = 3957988303675231981L; private static final long serialVersionUID = 3957988303675231981L;
/** /**
* Encode a list into JSON text and write it to out. * Encode a list into JSON text and write it to out.
@ -28,80 +27,80 @@ public class JSONArray extends ArrayList implements List, JSONAware, JSONStreamA
* @param list * @param list
* @param out * @param out
*/ */
public static void writeJSONString(List list, Writer out) throws IOException{ public static void writeJSONString(List list, Writer out) throws IOException {
if(list == null){ if (list == null) {
out.write("null"); out.write("null");
return; return;
} }
boolean first = true; boolean first = true;
Iterator iter=list.iterator(); Iterator iter = list.iterator();
out.write('['); out.write('[');
while(iter.hasNext()){ while (iter.hasNext()) {
if(first) if (first) {
first = false; first = false;
else } else {
out.write(','); out.write(',');
}
Object value=iter.next(); Object value = iter.next();
if(value == null){ if (value == null) {
out.write("null"); out.write("null");
continue; continue;
} }
JSONValue.writeJSONString(value, out); JSONValue.writeJSONString(value, out);
} }
out.write(']'); out.write(']');
} }
public void writeJSONString(Writer out) throws IOException{ public void writeJSONString(Writer out) throws IOException {
writeJSONString(this, out); writeJSONString(this, out);
} }
/** /**
* Convert a list to JSON text. The result is a JSON array. * Convert a list to JSON text. The result is a JSON array.
* If this list is also a JSONAware, JSONAware specific behaviours will be omitted at this top level. * If this list is also a JSONAware, JSONAware specific behaviours will be omitted at this top level.
* *
* @see org.json.simple.JSONValue#toJSONString(Object) * @see org.json.simple.JSONValue#toJSONString(Object)
* *
* @param list * @param list
* @return JSON text, or "null" if list is null. * @return JSON text, or "null" if list is null.
*/ */
public static String toJSONString(List list){ public static String toJSONString(List list) {
if(list == null) if (list == null) {
return "null"; return "null";
}
boolean first = true; boolean first = true;
StringBuffer sb = new StringBuffer(); StringBuffer sb = new StringBuffer();
Iterator iter=list.iterator(); Iterator iter = list.iterator();
sb.append('['); sb.append('[');
while(iter.hasNext()){ while (iter.hasNext()) {
if(first) if (first) {
first = false; first = false;
else } else {
sb.append(','); sb.append(',');
}
Object value=iter.next(); Object value = iter.next();
if(value == null){ if (value == null) {
sb.append("null"); sb.append("null");
continue; continue;
} }
sb.append(JSONValue.toJSONString(value)); sb.append(JSONValue.toJSONString(value));
} }
sb.append(']'); sb.append(']');
return sb.toString(); return sb.toString();
} }
public String toJSONString(){
return toJSONString(this);
}
public String toString() {
return toJSONString();
}
public String toJSONString() {
return toJSONString(this);
}
public String toString() {
return toJSONString();
}
} }

View File

@ -5,8 +5,8 @@ package org.json.simple;
* @author FangYidong<fangyidong@yahoo.com.cn> * @author FangYidong<fangyidong@yahoo.com.cn>
*/ */
public interface JSONAware { public interface JSONAware {
/** /**
* @return JSON text * @return JSON text
*/ */
String toJSONString(); String toJSONString();
} }

View File

@ -15,8 +15,8 @@ import java.util.Map;
* *
* @author FangYidong<fangyidong@yahoo.com.cn> * @author FangYidong<fangyidong@yahoo.com.cn>
*/ */
public class JSONObject extends HashMap implements Map, JSONAware, JSONStreamAware{ public class JSONObject extends HashMap implements Map, JSONAware, JSONStreamAware {
private static final long serialVersionUID = -503443796854799292L; private static final long serialVersionUID = -503443796854799292L;
/** /**
* Encode a map into JSON text and write it to out. * Encode a map into JSON text and write it to out.
@ -27,103 +27,107 @@ public class JSONObject extends HashMap implements Map, JSONAware, JSONStreamAwa
* @param map * @param map
* @param out * @param out
*/ */
public static void writeJSONString(Map map, Writer out) throws IOException { public static void writeJSONString(Map map, Writer out) throws IOException {
if(map == null){ if (map == null) {
out.write("null"); out.write("null");
return; return;
} }
boolean first = true; boolean first = true;
Iterator iter=map.entrySet().iterator(); Iterator iter = map.entrySet().iterator();
out.write('{'); out.write('{');
while(iter.hasNext()){ while (iter.hasNext()) {
if(first) if (first) {
first = false; first = false;
else } else {
out.write(','); out.write(',');
Map.Entry entry=(Map.Entry)iter.next(); }
Map.Entry entry = (Map.Entry) iter.next();
out.write('\"'); out.write('\"');
out.write(escape(String.valueOf(entry.getKey()))); out.write(escape(String.valueOf(entry.getKey())));
out.write('\"'); out.write('\"');
out.write(':'); out.write(':');
JSONValue.writeJSONString(entry.getValue(), out); JSONValue.writeJSONString(entry.getValue(), out);
} }
out.write('}'); out.write('}');
} }
public void writeJSONString(Writer out) throws IOException{ public void writeJSONString(Writer out) throws IOException {
writeJSONString(this, out); writeJSONString(this, out);
} }
/** /**
* Convert a map to JSON text. The result is a JSON object. * Convert a map to JSON text. The result is a JSON object.
* If this map is also a JSONAware, JSONAware specific behaviours will be omitted at this top level. * If this map is also a JSONAware, JSONAware specific behaviours will be omitted at this top level.
* *
* @see org.json.simple.JSONValue#toJSONString(Object) * @see org.json.simple.JSONValue#toJSONString(Object)
* *
* @param map * @param map
* @return JSON text, or "null" if map is null. * @return JSON text, or "null" if map is null.
*/ */
public static String toJSONString(Map map){ public static String toJSONString(Map map) {
if(map == null) if (map == null) {
return "null"; return "null";
}
StringBuffer sb = new StringBuffer(); StringBuffer sb = new StringBuffer();
boolean first = true; boolean first = true;
Iterator iter=map.entrySet().iterator(); Iterator iter = map.entrySet().iterator();
sb.append('{'); sb.append('{');
while(iter.hasNext()){ while (iter.hasNext()) {
if(first) if (first) {
first = false; first = false;
else } else {
sb.append(','); sb.append(',');
}
Map.Entry entry=(Map.Entry)iter.next(); Map.Entry entry = (Map.Entry) iter.next();
toJSONString(String.valueOf(entry.getKey()),entry.getValue(), sb); toJSONString(String.valueOf(entry.getKey()), entry.getValue(), sb);
} }
sb.append('}'); sb.append('}');
return sb.toString();
}
public String toJSONString(){
return toJSONString(this);
}
private static String toJSONString(String key,Object value, StringBuffer sb){
sb.append('\"');
if(key == null)
sb.append("null");
else
JSONValue.escape(key, sb);
sb.append('\"').append(':');
sb.append(JSONValue.toJSONString(value));
return sb.toString();
}
public String toString(){
return toJSONString();
}
public static String toString(String key,Object value){
StringBuffer sb = new StringBuffer();
toJSONString(key, value, sb);
return sb.toString(); return sb.toString();
} }
/** public String toJSONString() {
* Escape quotes, \, /, \r, \n, \b, \f, \t and other control characters (U+0000 through U+001F). return toJSONString(this);
* It's the same as JSONValue.escape() only for compatibility here. }
*
* @see org.json.simple.JSONValue#escape(String) private static String toJSONString(String key, Object value, StringBuffer sb) {
* sb.append('\"');
* @param s if (key == null) {
* @return sb.append("null");
*/ } else {
public static String escape(String s){ JSONValue.escape(key, sb);
return JSONValue.escape(s); }
} sb.append('\"').append(':');
sb.append(JSONValue.toJSONString(value));
return sb.toString();
}
public String toString() {
return toJSONString();
}
public static String toString(String key, Object value) {
StringBuffer sb = new StringBuffer();
toJSONString(key, value, sb);
return sb.toString();
}
/**
* Escape quotes, \, /, \r, \n, \b, \f, \t and other control characters (U+0000 through U+001F).
* It's the same as JSONValue.escape() only for compatibility here.
*
* @see org.json.simple.JSONValue#escape(String)
*
* @param s
* @return
*/
public static String escape(String s) {
return JSONValue.escape(s);
}
} }

View File

@ -8,8 +8,8 @@ import java.io.Writer;
* @author FangYidong<fangyidong@yahoo.com.cn> * @author FangYidong<fangyidong@yahoo.com.cn>
*/ */
public interface JSONStreamAware { public interface JSONStreamAware {
/** /**
* write JSON string to out. * write JSON string to out.
*/ */
void writeJSONString(Writer out) throws IOException; void writeJSONString(Writer out) throws IOException;
} }

View File

@ -14,69 +14,67 @@ import java.util.Map;
import org.json.simple.parser.JSONParser; import org.json.simple.parser.JSONParser;
import org.json.simple.parser.ParseException; import org.json.simple.parser.ParseException;
/** /**
* @author FangYidong<fangyidong@yahoo.com.cn> * @author FangYidong<fangyidong@yahoo.com.cn>
*/ */
public class JSONValue { public class JSONValue {
/** /**
* Parse JSON text into java object from the input source. * Parse JSON text into java object from the input source.
* Please use parseWithException() if you don't want to ignore the exception. * Please use parseWithException() if you don't want to ignore the exception.
* *
* @see org.json.simple.parser.JSONParser#parse(Reader) * @see org.json.simple.parser.JSONParser#parse(Reader)
* @see #parseWithException(Reader) * @see #parseWithException(Reader)
* *
* @param in * @param in
* @return Instance of the following: * @return Instance of the following:
* org.json.simple.JSONObject, * org.json.simple.JSONObject,
* org.json.simple.JSONArray, * org.json.simple.JSONArray,
* java.lang.String, * java.lang.String,
* java.lang.Number, * java.lang.Number,
* java.lang.Boolean, * java.lang.Boolean,
* null * null
* *
*/ */
public static Object parse(Reader in){ public static Object parse(Reader in) {
try{ try {
JSONParser parser=new JSONParser(); JSONParser parser = new JSONParser();
return parser.parse(in); return parser.parse(in);
} } catch (Exception e) {
catch(Exception e){ return null;
return null; }
} }
}
public static Object parse(String s){ public static Object parse(String s) {
StringReader in=new StringReader(s); StringReader in = new StringReader(s);
return parse(in); return parse(in);
} }
/** /**
* Parse JSON text into java object from the input source. * Parse JSON text into java object from the input source.
* *
* @see org.json.simple.parser.JSONParser * @see org.json.simple.parser.JSONParser
* *
* @param in * @param in
* @return Instance of the following: * @return Instance of the following:
* org.json.simple.JSONObject, * org.json.simple.JSONObject,
* org.json.simple.JSONArray, * org.json.simple.JSONArray,
* java.lang.String, * java.lang.String,
* java.lang.Number, * java.lang.Number,
* java.lang.Boolean, * java.lang.Boolean,
* null * null
* *
* @throws IOException * @throws IOException
* @throws ParseException * @throws ParseException
*/ */
public static Object parseWithException(Reader in) throws IOException, ParseException{ public static Object parseWithException(Reader in) throws IOException, ParseException {
JSONParser parser=new JSONParser(); JSONParser parser = new JSONParser();
return parser.parse(in); return parser.parse(in);
} }
public static Object parseWithException(String s) throws ParseException{ public static Object parseWithException(String s) throws ParseException {
JSONParser parser=new JSONParser(); JSONParser parser = new JSONParser();
return parser.parse(s); return parser.parse(s);
} }
/** /**
* Encode an object into JSON text and write it to out. * Encode an object into JSON text and write it to out.
@ -92,129 +90,141 @@ public class JSONValue {
* @param value * @param value
* @param writer * @param writer
*/ */
public static void writeJSONString(Object value, Writer out) throws IOException { public static void writeJSONString(Object value, Writer out) throws IOException {
if(value == null){ if (value == null) {
out.write("null"); out.write("null");
return;
}
if(value instanceof String){
out.write('\"');
out.write(escape((String)value));
out.write('\"');
return;
}
if(value instanceof Double){
if(((Double)value).isInfinite() || ((Double)value).isNaN())
out.write("null");
else
out.write(value.toString());
return;
}
if(value instanceof Float){
if(((Float)value).isInfinite() || ((Float)value).isNaN())
out.write("null");
else
out.write(value.toString());
return;
}
if(value instanceof Number){
out.write(value.toString());
return;
}
if(value instanceof Boolean){
out.write(value.toString());
return;
}
if((value instanceof JSONStreamAware)){
((JSONStreamAware)value).writeJSONString(out);
return;
}
if((value instanceof JSONAware)){
out.write(((JSONAware)value).toJSONString());
return;
}
if(value instanceof Map){
JSONObject.writeJSONString((Map)value, out);
return;
}
if(value instanceof List){
JSONArray.writeJSONString((List)value, out);
return; return;
} }
out.write(value.toString()); if (value instanceof String) {
} out.write('\"');
out.write(escape((String) value));
out.write('\"');
return;
}
/** if (value instanceof Double) {
* Convert an object to JSON text. if (((Double) value).isInfinite() || ((Double) value).isNaN()) {
* <p> out.write("null");
* If this object is a Map or a List, and it's also a JSONAware, JSONAware will be considered firstly. } else {
* <p> out.write(value.toString());
* DO NOT call this method from toJSONString() of a class that implements both JSONAware and Map or List with }
* "this" as the parameter, use JSONObject.toJSONString(Map) or JSONArray.toJSONString(List) instead. return;
* }
* @see org.json.simple.JSONObject#toJSONString(Map)
* @see org.json.simple.JSONArray#toJSONString(List)
*
* @param value
* @return JSON text, or "null" if value is null or it's an NaN or an INF number.
*/
public static String toJSONString(Object value){
if(value == null)
return "null";
if(value instanceof String) if (value instanceof Float) {
return "\""+escape((String)value)+"\""; if (((Float) value).isInfinite() || ((Float) value).isNaN()) {
out.write("null");
} else {
out.write(value.toString());
}
return;
}
if(value instanceof Double){ if (value instanceof Number) {
if(((Double)value).isInfinite() || ((Double)value).isNaN()) out.write(value.toString());
return "null"; return;
else }
return value.toString();
}
if(value instanceof Float){ if (value instanceof Boolean) {
if(((Float)value).isInfinite() || ((Float)value).isNaN()) out.write(value.toString());
return "null"; return;
else }
return value.toString();
}
if(value instanceof Number) if ((value instanceof JSONStreamAware)) {
return value.toString(); ((JSONStreamAware) value).writeJSONString(out);
return;
}
if(value instanceof Boolean) if ((value instanceof JSONAware)) {
return value.toString(); out.write(((JSONAware) value).toJSONString());
return;
}
if((value instanceof JSONAware)) if (value instanceof Map) {
return ((JSONAware)value).toJSONString(); JSONObject.writeJSONString((Map) value, out);
return;
}
if(value instanceof Map) if (value instanceof List) {
return JSONObject.toJSONString((Map)value); JSONArray.writeJSONString((List) value, out);
return;
}
if(value instanceof List) out.write(value.toString());
return JSONArray.toJSONString((List)value); }
return value.toString(); /**
} * Convert an object to JSON text.
* <p>
* If this object is a Map or a List, and it's also a JSONAware, JSONAware will be considered firstly.
* <p>
* DO NOT call this method from toJSONString() of a class that implements both JSONAware and Map or List with
* "this" as the parameter, use JSONObject.toJSONString(Map) or JSONArray.toJSONString(List) instead.
*
* @see org.json.simple.JSONObject#toJSONString(Map)
* @see org.json.simple.JSONArray#toJSONString(List)
*
* @param value
* @return JSON text, or "null" if value is null or it's an NaN or an INF number.
*/
public static String toJSONString(Object value) {
if (value == null) {
return "null";
}
/** if (value instanceof String) {
* Escape quotes, \, /, \r, \n, \b, \f, \t and other control characters (U+0000 through U+001F). return "\"" + escape((String) value) + "\"";
* @param s }
* @return
*/ if (value instanceof Double) {
public static String escape(String s){ if (((Double) value).isInfinite() || ((Double) value).isNaN()) {
if(s==null) return "null";
return null; } else {
return value.toString();
}
}
if (value instanceof Float) {
if (((Float) value).isInfinite() || ((Float) value).isNaN()) {
return "null";
} else {
return value.toString();
}
}
if (value instanceof Number) {
return value.toString();
}
if (value instanceof Boolean) {
return value.toString();
}
if ((value instanceof JSONAware)) {
return ((JSONAware) value).toJSONString();
}
if (value instanceof Map) {
return JSONObject.toJSONString((Map) value);
}
if (value instanceof List) {
return JSONArray.toJSONString((List) value);
}
return value.toString();
}
/**
* Escape quotes, \, /, \r, \n, \b, \f, \t and other control characters (U+0000 through U+001F).
* @param s
* @return
*/
public static String escape(String s) {
if (s == null) {
return null;
}
StringBuffer sb = new StringBuffer(); StringBuffer sb = new StringBuffer();
escape(s, sb); escape(s, sb);
return sb.toString(); return sb.toString();
@ -225,48 +235,46 @@ public class JSONValue {
* @param sb * @param sb
*/ */
static void escape(String s, StringBuffer sb) { static void escape(String s, StringBuffer sb) {
for(int i=0;i<s.length();i++){ for (int i = 0; i < s.length(); i++) {
char ch=s.charAt(i); char ch = s.charAt(i);
switch(ch){ switch (ch) {
case '"': case '"':
sb.append("\\\""); sb.append("\\\"");
break; break;
case '\\': case '\\':
sb.append("\\\\"); sb.append("\\\\");
break; break;
case '\b': case '\b':
sb.append("\\b"); sb.append("\\b");
break; break;
case '\f': case '\f':
sb.append("\\f"); sb.append("\\f");
break; break;
case '\n': case '\n':
sb.append("\\n"); sb.append("\\n");
break; break;
case '\r': case '\r':
sb.append("\\r"); sb.append("\\r");
break; break;
case '\t': case '\t':
sb.append("\\t"); sb.append("\\t");
break; break;
case '/': case '/':
sb.append("\\/"); sb.append("\\/");
break; break;
default: default:
//Reference: http://www.unicode.org/versions/Unicode5.1.0/ //Reference: http://www.unicode.org/versions/Unicode5.1.0/
if((ch>='\u0000' && ch<='\u001F') || (ch>='\u007F' && ch<='\u009F') || (ch>='\u2000' && ch<='\u20FF')){ if ((ch >= '\u0000' && ch <= '\u001F') || (ch >= '\u007F' && ch <= '\u009F') || (ch >= '\u2000' && ch <= '\u20FF')) {
String ss=Integer.toHexString(ch); String ss = Integer.toHexString(ch);
sb.append("\\u"); sb.append("\\u");
for(int k=0;k<4-ss.length();k++){ for (int k = 0; k < 4 - ss.length(); k++) {
sb.append('0'); sb.append('0');
} }
sb.append(ss.toUpperCase()); sb.append(ss.toUpperCase());
} } else {
else{ sb.append(ch);
sb.append(ch); }
} }
} }//for
}//for }
}
} }

View File

@ -11,13 +11,13 @@ import java.util.Map;
* @author FangYidong<fangyidong@yahoo.com.cn> * @author FangYidong<fangyidong@yahoo.com.cn>
*/ */
public interface ContainerFactory { public interface ContainerFactory {
/** /**
* @return A Map instance to store JSON object, or null if you want to use org.json.simple.JSONObject. * @return A Map instance to store JSON object, or null if you want to use org.json.simple.JSONObject.
*/ */
Map createObjectContainer(); Map createObjectContainer();
/** /**
* @return A List instance to store JSON array, or null if you want to use org.json.simple.JSONArray. * @return A List instance to store JSON array, or null if you want to use org.json.simple.JSONArray.
*/ */
List creatArrayContainer(); List creatArrayContainer();
} }

View File

@ -11,100 +11,99 @@ import java.io.IOException;
* @author FangYidong<fangyidong@yahoo.com.cn> * @author FangYidong<fangyidong@yahoo.com.cn>
*/ */
public interface ContentHandler { public interface ContentHandler {
/** /**
* Receive notification of the beginning of JSON processing. * Receive notification of the beginning of JSON processing.
* The parser will invoke this method only once. * The parser will invoke this method only once.
* *
* @throws ParseException * @throws ParseException
* - JSONParser will stop and throw the same exception to the caller when receiving this exception. * - JSONParser will stop and throw the same exception to the caller when receiving this exception.
*/ */
void startJSON() throws ParseException, IOException; void startJSON() throws ParseException, IOException;
/** /**
* Receive notification of the end of JSON processing. * Receive notification of the end of JSON processing.
* *
* @throws ParseException * @throws ParseException
*/ */
void endJSON() throws ParseException, IOException; void endJSON() throws ParseException, IOException;
/** /**
* Receive notification of the beginning of a JSON object. * Receive notification of the beginning of a JSON object.
* *
* @return false if the handler wants to stop parsing after return. * @return false if the handler wants to stop parsing after return.
* @throws ParseException * @throws ParseException
* - JSONParser will stop and throw the same exception to the caller when receiving this exception. * - JSONParser will stop and throw the same exception to the caller when receiving this exception.
* @see #endJSON * @see #endJSON
*/ */
boolean startObject() throws ParseException, IOException; boolean startObject() throws ParseException, IOException;
/** /**
* Receive notification of the end of a JSON object. * Receive notification of the end of a JSON object.
* *
* @return false if the handler wants to stop parsing after return. * @return false if the handler wants to stop parsing after return.
* @throws ParseException * @throws ParseException
* *
* @see #startObject * @see #startObject
*/ */
boolean endObject() throws ParseException, IOException; boolean endObject() throws ParseException, IOException;
/** /**
* Receive notification of the beginning of a JSON object entry. * Receive notification of the beginning of a JSON object entry.
* *
* @param key - Key of a JSON object entry. * @param key - Key of a JSON object entry.
* *
* @return false if the handler wants to stop parsing after return. * @return false if the handler wants to stop parsing after return.
* @throws ParseException * @throws ParseException
* *
* @see #endObjectEntry * @see #endObjectEntry
*/ */
boolean startObjectEntry(String key) throws ParseException, IOException; boolean startObjectEntry(String key) throws ParseException, IOException;
/** /**
* Receive notification of the end of the value of previous object entry. * Receive notification of the end of the value of previous object entry.
* *
* @return false if the handler wants to stop parsing after return. * @return false if the handler wants to stop parsing after return.
* @throws ParseException * @throws ParseException
* *
* @see #startObjectEntry * @see #startObjectEntry
*/ */
boolean endObjectEntry() throws ParseException, IOException; boolean endObjectEntry() throws ParseException, IOException;
/** /**
* Receive notification of the beginning of a JSON array. * Receive notification of the beginning of a JSON array.
* *
* @return false if the handler wants to stop parsing after return. * @return false if the handler wants to stop parsing after return.
* @throws ParseException * @throws ParseException
* *
* @see #endArray * @see #endArray
*/ */
boolean startArray() throws ParseException, IOException; boolean startArray() throws ParseException, IOException;
/** /**
* Receive notification of the end of a JSON array. * Receive notification of the end of a JSON array.
* *
* @return false if the handler wants to stop parsing after return. * @return false if the handler wants to stop parsing after return.
* @throws ParseException * @throws ParseException
* *
* @see #startArray * @see #startArray
*/ */
boolean endArray() throws ParseException, IOException; boolean endArray() throws ParseException, IOException;
/**
* Receive notification of the JSON primitive values:
* java.lang.String,
* java.lang.Number,
* java.lang.Boolean
* null
*
* @param value - Instance of the following:
* java.lang.String,
* java.lang.Number,
* java.lang.Boolean
* null
*
* @return false if the handler wants to stop parsing after return.
* @throws ParseException
*/
boolean primitive(Object value) throws ParseException, IOException;
/**
* Receive notification of the JSON primitive values:
* java.lang.String,
* java.lang.Number,
* java.lang.Boolean
* null
*
* @param value - Instance of the following:
* java.lang.String,
* java.lang.Number,
* java.lang.Boolean
* null
*
* @return false if the handler wants to stop parsing after return.
* @throws ParseException
*/
boolean primitive(Object value) throws ParseException, IOException;
} }

View File

@ -14,39 +14,38 @@ import java.util.Map;
import org.json.simple.JSONArray; import org.json.simple.JSONArray;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
/** /**
* Parser for JSON text. Please note that JSONParser is NOT thread-safe. * Parser for JSON text. Please note that JSONParser is NOT thread-safe.
* *
* @author FangYidong<fangyidong@yahoo.com.cn> * @author FangYidong<fangyidong@yahoo.com.cn>
*/ */
public class JSONParser { public class JSONParser {
public static final int S_INIT=0; public static final int S_INIT = 0;
public static final int S_IN_FINISHED_VALUE=1;//string,number,boolean,null,object,array public static final int S_IN_FINISHED_VALUE = 1;//string,number,boolean,null,object,array
public static final int S_IN_OBJECT=2; public static final int S_IN_OBJECT = 2;
public static final int S_IN_ARRAY=3; public static final int S_IN_ARRAY = 3;
public static final int S_PASSED_PAIR_KEY=4; public static final int S_PASSED_PAIR_KEY = 4;
public static final int S_IN_PAIR_VALUE=5; public static final int S_IN_PAIR_VALUE = 5;
public static final int S_END=6; public static final int S_END = 6;
public static final int S_IN_ERROR=-1; public static final int S_IN_ERROR = -1;
private LinkedList handlerStatusStack;
private Yylex lexer = new Yylex((Reader) null);
private Yytoken token = null;
private int status = S_INIT;
private LinkedList handlerStatusStack; private int peekStatus(LinkedList statusStack) {
private Yylex lexer = new Yylex((Reader)null); if (statusStack.size() == 0) {
private Yytoken token = null; return -1;
private int status = S_INIT; }
Integer status = (Integer) statusStack.getFirst();
private int peekStatus(LinkedList statusStack){ return status.intValue();
if(statusStack.size()==0) }
return -1;
Integer status=(Integer)statusStack.getFirst();
return status.intValue();
}
/** /**
* Reset the parser to the initial state without resetting the underlying reader. * Reset the parser to the initial state without resetting the underlying reader.
* *
*/ */
public void reset(){ public void reset() {
token = null; token = null;
status = S_INIT; status = S_INIT;
handlerStatusStack = null; handlerStatusStack = null;
@ -59,475 +58,480 @@ public class JSONParser {
* @throws IOException * @throws IOException
* @throws ParseException * @throws ParseException
*/ */
public void reset(Reader in){ public void reset(Reader in) {
lexer.yyreset(in); lexer.yyreset(in);
reset(); reset();
} }
/** /**
* @return The position of the beginning of the current token. * @return The position of the beginning of the current token.
*/ */
public int getPosition(){ public int getPosition() {
return lexer.getPosition(); return lexer.getPosition();
} }
public Object parse(String s) throws ParseException{ public Object parse(String s) throws ParseException {
return parse(s, (ContainerFactory)null); return parse(s, (ContainerFactory) null);
} }
public Object parse(String s, ContainerFactory containerFactory) throws ParseException{ public Object parse(String s, ContainerFactory containerFactory) throws ParseException {
StringReader in=new StringReader(s); StringReader in = new StringReader(s);
try{ try {
return parse(in, containerFactory); return parse(in, containerFactory);
} } catch (IOException ie) {
catch(IOException ie){ /*
/* * Actually it will never happen.
* Actually it will never happen. */
*/ throw new ParseException(-1, ParseException.ERROR_UNEXPECTED_EXCEPTION, ie);
throw new ParseException(-1, ParseException.ERROR_UNEXPECTED_EXCEPTION, ie); }
} }
}
public Object parse(Reader in) throws IOException, ParseException{ public Object parse(Reader in) throws IOException, ParseException {
return parse(in, (ContainerFactory)null); return parse(in, (ContainerFactory) null);
} }
/** /**
* Parse JSON text into java object from the input source. * Parse JSON text into java object from the input source.
* *
* @param in * @param in
* @param containerFactory - Use this factory to createyour own JSON object and JSON array containers. * @param containerFactory - Use this factory to createyour own JSON object and JSON array containers.
* @return Instance of the following: * @return Instance of the following:
* org.json.simple.JSONObject, * org.json.simple.JSONObject,
* org.json.simple.JSONArray, * org.json.simple.JSONArray,
* java.lang.String, * java.lang.String,
* java.lang.Number, * java.lang.Number,
* java.lang.Boolean, * java.lang.Boolean,
* null * null
* *
* @throws IOException * @throws IOException
* @throws ParseException * @throws ParseException
*/ */
public Object parse(Reader in, ContainerFactory containerFactory) throws IOException, ParseException{ public Object parse(Reader in, ContainerFactory containerFactory) throws IOException, ParseException {
reset(in); reset(in);
LinkedList statusStack = new LinkedList(); LinkedList statusStack = new LinkedList();
LinkedList valueStack = new LinkedList(); LinkedList valueStack = new LinkedList();
try{ try {
do{ do {
nextToken(); nextToken();
switch(status){ switch (status) {
case S_INIT: case S_INIT:
switch(token.type){ switch (token.type) {
case Yytoken.TYPE_VALUE: case Yytoken.TYPE_VALUE:
status=S_IN_FINISHED_VALUE; status = S_IN_FINISHED_VALUE;
statusStack.addFirst(new Integer(status)); statusStack.addFirst(new Integer(status));
valueStack.addFirst(token.value); valueStack.addFirst(token.value);
break; break;
case Yytoken.TYPE_LEFT_BRACE: case Yytoken.TYPE_LEFT_BRACE:
status=S_IN_OBJECT; status = S_IN_OBJECT;
statusStack.addFirst(new Integer(status)); statusStack.addFirst(new Integer(status));
valueStack.addFirst(createObjectContainer(containerFactory)); valueStack.addFirst(createObjectContainer(containerFactory));
break; break;
case Yytoken.TYPE_LEFT_SQUARE: case Yytoken.TYPE_LEFT_SQUARE:
status=S_IN_ARRAY; status = S_IN_ARRAY;
statusStack.addFirst(new Integer(status)); statusStack.addFirst(new Integer(status));
valueStack.addFirst(createArrayContainer(containerFactory)); valueStack.addFirst(createArrayContainer(containerFactory));
break; break;
default: default:
status=S_IN_ERROR; status = S_IN_ERROR;
}//inner switch }//inner switch
break; break;
case S_IN_FINISHED_VALUE: case S_IN_FINISHED_VALUE:
if(token.type==Yytoken.TYPE_EOF) if (token.type == Yytoken.TYPE_EOF) {
return valueStack.removeFirst(); return valueStack.removeFirst();
else } else {
throw new ParseException(getPosition(), ParseException.ERROR_UNEXPECTED_TOKEN, token); throw new ParseException(getPosition(), ParseException.ERROR_UNEXPECTED_TOKEN, token);
}
case S_IN_OBJECT: case S_IN_OBJECT:
switch(token.type){ switch (token.type) {
case Yytoken.TYPE_COMMA: case Yytoken.TYPE_COMMA:
break; break;
case Yytoken.TYPE_VALUE: case Yytoken.TYPE_VALUE:
if(token.value instanceof String){ if (token.value instanceof String) {
String key=(String)token.value; String key = (String) token.value;
valueStack.addFirst(key); valueStack.addFirst(key);
status=S_PASSED_PAIR_KEY; status = S_PASSED_PAIR_KEY;
statusStack.addFirst(new Integer(status)); statusStack.addFirst(new Integer(status));
} } else {
else{ status = S_IN_ERROR;
status=S_IN_ERROR; }
} break;
break; case Yytoken.TYPE_RIGHT_BRACE:
case Yytoken.TYPE_RIGHT_BRACE: if (valueStack.size() > 1) {
if(valueStack.size()>1){ statusStack.removeFirst();
statusStack.removeFirst(); valueStack.removeFirst();
valueStack.removeFirst(); status = peekStatus(statusStack);
status=peekStatus(statusStack); } else {
} status = S_IN_FINISHED_VALUE;
else{ }
status=S_IN_FINISHED_VALUE; break;
} default:
break; status = S_IN_ERROR;
default: break;
status=S_IN_ERROR; }//inner switch
break; break;
}//inner switch
break;
case S_PASSED_PAIR_KEY: case S_PASSED_PAIR_KEY:
switch(token.type){ switch (token.type) {
case Yytoken.TYPE_COLON: case Yytoken.TYPE_COLON:
break; break;
case Yytoken.TYPE_VALUE: case Yytoken.TYPE_VALUE:
statusStack.removeFirst(); statusStack.removeFirst();
String key=(String)valueStack.removeFirst(); String key = (String) valueStack.removeFirst();
Map parent=(Map)valueStack.getFirst(); Map parent = (Map) valueStack.getFirst();
parent.put(key,token.value); parent.put(key, token.value);
status=peekStatus(statusStack); status = peekStatus(statusStack);
break; break;
case Yytoken.TYPE_LEFT_SQUARE: case Yytoken.TYPE_LEFT_SQUARE:
statusStack.removeFirst(); statusStack.removeFirst();
key=(String)valueStack.removeFirst(); key = (String) valueStack.removeFirst();
parent=(Map)valueStack.getFirst(); parent = (Map) valueStack.getFirst();
List newArray=createArrayContainer(containerFactory); List newArray = createArrayContainer(containerFactory);
parent.put(key,newArray); parent.put(key, newArray);
status=S_IN_ARRAY; status = S_IN_ARRAY;
statusStack.addFirst(new Integer(status)); statusStack.addFirst(new Integer(status));
valueStack.addFirst(newArray); valueStack.addFirst(newArray);
break; break;
case Yytoken.TYPE_LEFT_BRACE: case Yytoken.TYPE_LEFT_BRACE:
statusStack.removeFirst(); statusStack.removeFirst();
key=(String)valueStack.removeFirst(); key = (String) valueStack.removeFirst();
parent=(Map)valueStack.getFirst(); parent = (Map) valueStack.getFirst();
Map newObject=createObjectContainer(containerFactory); Map newObject = createObjectContainer(containerFactory);
parent.put(key,newObject); parent.put(key, newObject);
status=S_IN_OBJECT; status = S_IN_OBJECT;
statusStack.addFirst(new Integer(status)); statusStack.addFirst(new Integer(status));
valueStack.addFirst(newObject); valueStack.addFirst(newObject);
break; break;
default: default:
status=S_IN_ERROR; status = S_IN_ERROR;
} }
break; break;
case S_IN_ARRAY: case S_IN_ARRAY:
switch(token.type){ switch (token.type) {
case Yytoken.TYPE_COMMA: case Yytoken.TYPE_COMMA:
break; break;
case Yytoken.TYPE_VALUE: case Yytoken.TYPE_VALUE:
List val=(List)valueStack.getFirst(); List val = (List) valueStack.getFirst();
val.add(token.value); val.add(token.value);
break; break;
case Yytoken.TYPE_RIGHT_SQUARE: case Yytoken.TYPE_RIGHT_SQUARE:
if(valueStack.size()>1){ if (valueStack.size() > 1) {
statusStack.removeFirst(); statusStack.removeFirst();
valueStack.removeFirst(); valueStack.removeFirst();
status=peekStatus(statusStack); status = peekStatus(statusStack);
} } else {
else{ status = S_IN_FINISHED_VALUE;
status=S_IN_FINISHED_VALUE; }
} break;
break; case Yytoken.TYPE_LEFT_BRACE:
case Yytoken.TYPE_LEFT_BRACE: val = (List) valueStack.getFirst();
val=(List)valueStack.getFirst(); Map newObject = createObjectContainer(containerFactory);
Map newObject=createObjectContainer(containerFactory); val.add(newObject);
val.add(newObject); status = S_IN_OBJECT;
status=S_IN_OBJECT; statusStack.addFirst(new Integer(status));
statusStack.addFirst(new Integer(status)); valueStack.addFirst(newObject);
valueStack.addFirst(newObject); break;
break; case Yytoken.TYPE_LEFT_SQUARE:
case Yytoken.TYPE_LEFT_SQUARE: val = (List) valueStack.getFirst();
val=(List)valueStack.getFirst(); List newArray = createArrayContainer(containerFactory);
List newArray=createArrayContainer(containerFactory); val.add(newArray);
val.add(newArray); status = S_IN_ARRAY;
status=S_IN_ARRAY; statusStack.addFirst(new Integer(status));
statusStack.addFirst(new Integer(status)); valueStack.addFirst(newArray);
valueStack.addFirst(newArray); break;
break; default:
default: status = S_IN_ERROR;
status=S_IN_ERROR; }//inner switch
}//inner switch break;
break; case S_IN_ERROR:
case S_IN_ERROR: throw new ParseException(getPosition(), ParseException.ERROR_UNEXPECTED_TOKEN, token);
throw new ParseException(getPosition(), ParseException.ERROR_UNEXPECTED_TOKEN, token); }//switch
}//switch if (status == S_IN_ERROR) {
if(status==S_IN_ERROR){ throw new ParseException(getPosition(), ParseException.ERROR_UNEXPECTED_TOKEN, token);
throw new ParseException(getPosition(), ParseException.ERROR_UNEXPECTED_TOKEN, token); }
} } while (token.type != Yytoken.TYPE_EOF);
}while(token.type!=Yytoken.TYPE_EOF); } catch (IOException ie) {
} throw ie;
catch(IOException ie){ }
throw ie;
}
throw new ParseException(getPosition(), ParseException.ERROR_UNEXPECTED_TOKEN, token); throw new ParseException(getPosition(), ParseException.ERROR_UNEXPECTED_TOKEN, token);
} }
private void nextToken() throws ParseException, IOException{ private void nextToken() throws ParseException, IOException {
token = lexer.yylex(); token = lexer.yylex();
if(token == null) if (token == null) {
token = new Yytoken(Yytoken.TYPE_EOF, null); token = new Yytoken(Yytoken.TYPE_EOF, null);
} }
}
private Map createObjectContainer(ContainerFactory containerFactory){ private Map createObjectContainer(ContainerFactory containerFactory) {
if(containerFactory == null) if (containerFactory == null) {
return new JSONObject(); return new JSONObject();
Map m = containerFactory.createObjectContainer(); }
Map m = containerFactory.createObjectContainer();
if(m == null) if (m == null) {
return new JSONObject(); return new JSONObject();
return m; }
} return m;
}
private List createArrayContainer(ContainerFactory containerFactory){ private List createArrayContainer(ContainerFactory containerFactory) {
if(containerFactory == null) if (containerFactory == null) {
return new JSONArray(); return new JSONArray();
List l = containerFactory.creatArrayContainer(); }
List l = containerFactory.creatArrayContainer();
if(l == null) if (l == null) {
return new JSONArray(); return new JSONArray();
return l; }
} return l;
}
public void parse(String s, ContentHandler contentHandler) throws ParseException{ public void parse(String s, ContentHandler contentHandler) throws ParseException {
parse(s, contentHandler, false); parse(s, contentHandler, false);
} }
public void parse(String s, ContentHandler contentHandler, boolean isResume) throws ParseException{ public void parse(String s, ContentHandler contentHandler, boolean isResume) throws ParseException {
StringReader in=new StringReader(s); StringReader in = new StringReader(s);
try{ try {
parse(in, contentHandler, isResume); parse(in, contentHandler, isResume);
} } catch (IOException ie) {
catch(IOException ie){ /*
/* * Actually it will never happen.
* Actually it will never happen. */
*/ throw new ParseException(-1, ParseException.ERROR_UNEXPECTED_EXCEPTION, ie);
throw new ParseException(-1, ParseException.ERROR_UNEXPECTED_EXCEPTION, ie); }
} }
}
public void parse(Reader in, ContentHandler contentHandler) throws IOException, ParseException{ public void parse(Reader in, ContentHandler contentHandler) throws IOException, ParseException {
parse(in, contentHandler, false); parse(in, contentHandler, false);
} }
/** /**
* Stream processing of JSON text. * Stream processing of JSON text.
* *
* @see ContentHandler * @see ContentHandler
* *
* @param in * @param in
* @param contentHandler * @param contentHandler
* @param isResume - Indicates if it continues previous parsing operation. * @param isResume - Indicates if it continues previous parsing operation.
* If set to true, resume parsing the old stream, and parameter 'in' will be ignored. * If set to true, resume parsing the old stream, and parameter 'in' will be ignored.
* If this method is called for the first time in this instance, isResume will be ignored. * If this method is called for the first time in this instance, isResume will be ignored.
* *
* @throws IOException * @throws IOException
* @throws ParseException * @throws ParseException
*/ */
public void parse(Reader in, ContentHandler contentHandler, boolean isResume) throws IOException, ParseException{ public void parse(Reader in, ContentHandler contentHandler, boolean isResume) throws IOException, ParseException {
if(!isResume){ if (!isResume) {
reset(in); reset(in);
handlerStatusStack = new LinkedList(); handlerStatusStack = new LinkedList();
} } else {
else{ if (handlerStatusStack == null) {
if(handlerStatusStack == null){ isResume = false;
isResume = false; reset(in);
reset(in); handlerStatusStack = new LinkedList();
handlerStatusStack = new LinkedList(); }
} }
}
LinkedList statusStack = handlerStatusStack; LinkedList statusStack = handlerStatusStack;
try{ try {
do{ do {
switch(status){ switch (status) {
case S_INIT: case S_INIT:
contentHandler.startJSON(); contentHandler.startJSON();
nextToken(); nextToken();
switch(token.type){ switch (token.type) {
case Yytoken.TYPE_VALUE: case Yytoken.TYPE_VALUE:
status=S_IN_FINISHED_VALUE; status = S_IN_FINISHED_VALUE;
statusStack.addFirst(new Integer(status)); statusStack.addFirst(new Integer(status));
if(!contentHandler.primitive(token.value)) if (!contentHandler.primitive(token.value)) {
return; return;
break; }
case Yytoken.TYPE_LEFT_BRACE: break;
status=S_IN_OBJECT; case Yytoken.TYPE_LEFT_BRACE:
statusStack.addFirst(new Integer(status)); status = S_IN_OBJECT;
if(!contentHandler.startObject()) statusStack.addFirst(new Integer(status));
return; if (!contentHandler.startObject()) {
break; return;
case Yytoken.TYPE_LEFT_SQUARE: }
status=S_IN_ARRAY; break;
statusStack.addFirst(new Integer(status)); case Yytoken.TYPE_LEFT_SQUARE:
if(!contentHandler.startArray()) status = S_IN_ARRAY;
return; statusStack.addFirst(new Integer(status));
break; if (!contentHandler.startArray()) {
default: return;
status=S_IN_ERROR; }
}//inner switch break;
break; default:
status = S_IN_ERROR;
}//inner switch
break;
case S_IN_FINISHED_VALUE: case S_IN_FINISHED_VALUE:
nextToken(); nextToken();
if(token.type==Yytoken.TYPE_EOF){ if (token.type == Yytoken.TYPE_EOF) {
contentHandler.endJSON(); contentHandler.endJSON();
status = S_END; status = S_END;
return; return;
} } else {
else{ status = S_IN_ERROR;
status = S_IN_ERROR; throw new ParseException(getPosition(), ParseException.ERROR_UNEXPECTED_TOKEN, token);
throw new ParseException(getPosition(), ParseException.ERROR_UNEXPECTED_TOKEN, token); }
}
case S_IN_OBJECT: case S_IN_OBJECT:
nextToken(); nextToken();
switch(token.type){ switch (token.type) {
case Yytoken.TYPE_COMMA: case Yytoken.TYPE_COMMA:
break; break;
case Yytoken.TYPE_VALUE: case Yytoken.TYPE_VALUE:
if(token.value instanceof String){ if (token.value instanceof String) {
String key=(String)token.value; String key = (String) token.value;
status=S_PASSED_PAIR_KEY; status = S_PASSED_PAIR_KEY;
statusStack.addFirst(new Integer(status)); statusStack.addFirst(new Integer(status));
if(!contentHandler.startObjectEntry(key)) if (!contentHandler.startObjectEntry(key)) {
return; return;
} }
else{ } else {
status=S_IN_ERROR; status = S_IN_ERROR;
} }
break; break;
case Yytoken.TYPE_RIGHT_BRACE: case Yytoken.TYPE_RIGHT_BRACE:
if(statusStack.size()>1){ if (statusStack.size() > 1) {
statusStack.removeFirst(); statusStack.removeFirst();
status=peekStatus(statusStack); status = peekStatus(statusStack);
} } else {
else{ status = S_IN_FINISHED_VALUE;
status=S_IN_FINISHED_VALUE; }
} if (!contentHandler.endObject()) {
if(!contentHandler.endObject()) return;
return; }
break; break;
default: default:
status=S_IN_ERROR; status = S_IN_ERROR;
break; break;
}//inner switch }//inner switch
break; break;
case S_PASSED_PAIR_KEY: case S_PASSED_PAIR_KEY:
nextToken(); nextToken();
switch(token.type){ switch (token.type) {
case Yytoken.TYPE_COLON: case Yytoken.TYPE_COLON:
break; break;
case Yytoken.TYPE_VALUE: case Yytoken.TYPE_VALUE:
statusStack.removeFirst(); statusStack.removeFirst();
status=peekStatus(statusStack); status = peekStatus(statusStack);
if(!contentHandler.primitive(token.value)) if (!contentHandler.primitive(token.value)) {
return; return;
if(!contentHandler.endObjectEntry()) }
return; if (!contentHandler.endObjectEntry()) {
break; return;
case Yytoken.TYPE_LEFT_SQUARE: }
statusStack.removeFirst(); break;
statusStack.addFirst(new Integer(S_IN_PAIR_VALUE)); case Yytoken.TYPE_LEFT_SQUARE:
status=S_IN_ARRAY; statusStack.removeFirst();
statusStack.addFirst(new Integer(status)); statusStack.addFirst(new Integer(S_IN_PAIR_VALUE));
if(!contentHandler.startArray()) status = S_IN_ARRAY;
return; statusStack.addFirst(new Integer(status));
break; if (!contentHandler.startArray()) {
case Yytoken.TYPE_LEFT_BRACE: return;
statusStack.removeFirst(); }
statusStack.addFirst(new Integer(S_IN_PAIR_VALUE)); break;
status=S_IN_OBJECT; case Yytoken.TYPE_LEFT_BRACE:
statusStack.addFirst(new Integer(status)); statusStack.removeFirst();
if(!contentHandler.startObject()) statusStack.addFirst(new Integer(S_IN_PAIR_VALUE));
return; status = S_IN_OBJECT;
break; statusStack.addFirst(new Integer(status));
default: if (!contentHandler.startObject()) {
status=S_IN_ERROR; return;
} }
break; break;
default:
status = S_IN_ERROR;
}
break;
case S_IN_PAIR_VALUE: case S_IN_PAIR_VALUE:
/* /*
* S_IN_PAIR_VALUE is just a marker to indicate the end of an object entry, it doesn't proccess any token, * S_IN_PAIR_VALUE is just a marker to indicate the end of an object entry, it doesn't proccess any token,
* therefore delay consuming token until next round. * therefore delay consuming token until next round.
*/ */
statusStack.removeFirst(); statusStack.removeFirst();
status = peekStatus(statusStack); status = peekStatus(statusStack);
if(!contentHandler.endObjectEntry()) if (!contentHandler.endObjectEntry()) {
return; return;
break; }
break;
case S_IN_ARRAY: case S_IN_ARRAY:
nextToken(); nextToken();
switch(token.type){ switch (token.type) {
case Yytoken.TYPE_COMMA: case Yytoken.TYPE_COMMA:
break; break;
case Yytoken.TYPE_VALUE: case Yytoken.TYPE_VALUE:
if(!contentHandler.primitive(token.value)) if (!contentHandler.primitive(token.value)) {
return; return;
break; }
case Yytoken.TYPE_RIGHT_SQUARE: break;
if(statusStack.size()>1){ case Yytoken.TYPE_RIGHT_SQUARE:
statusStack.removeFirst(); if (statusStack.size() > 1) {
status=peekStatus(statusStack); statusStack.removeFirst();
} status = peekStatus(statusStack);
else{ } else {
status=S_IN_FINISHED_VALUE; status = S_IN_FINISHED_VALUE;
} }
if(!contentHandler.endArray()) if (!contentHandler.endArray()) {
return; return;
break; }
case Yytoken.TYPE_LEFT_BRACE: break;
status=S_IN_OBJECT; case Yytoken.TYPE_LEFT_BRACE:
statusStack.addFirst(new Integer(status)); status = S_IN_OBJECT;
if(!contentHandler.startObject()) statusStack.addFirst(new Integer(status));
return; if (!contentHandler.startObject()) {
break; return;
case Yytoken.TYPE_LEFT_SQUARE: }
status=S_IN_ARRAY; break;
statusStack.addFirst(new Integer(status)); case Yytoken.TYPE_LEFT_SQUARE:
if(!contentHandler.startArray()) status = S_IN_ARRAY;
return; statusStack.addFirst(new Integer(status));
break; if (!contentHandler.startArray()) {
default: return;
status=S_IN_ERROR; }
}//inner switch break;
break; default:
status = S_IN_ERROR;
}//inner switch
break;
case S_END: case S_END:
return; return;
case S_IN_ERROR: case S_IN_ERROR:
throw new ParseException(getPosition(), ParseException.ERROR_UNEXPECTED_TOKEN, token); throw new ParseException(getPosition(), ParseException.ERROR_UNEXPECTED_TOKEN, token);
}//switch }//switch
if(status==S_IN_ERROR){ if (status == S_IN_ERROR) {
throw new ParseException(getPosition(), ParseException.ERROR_UNEXPECTED_TOKEN, token); throw new ParseException(getPosition(), ParseException.ERROR_UNEXPECTED_TOKEN, token);
} }
}while(token.type!=Yytoken.TYPE_EOF); } while (token.type != Yytoken.TYPE_EOF);
} } catch (IOException ie) {
catch(IOException ie){ status = S_IN_ERROR;
status = S_IN_ERROR; throw ie;
throw ie; } catch (ParseException pe) {
} status = S_IN_ERROR;
catch(ParseException pe){ throw pe;
status = S_IN_ERROR; } catch (RuntimeException re) {
throw pe; status = S_IN_ERROR;
} throw re;
catch(RuntimeException re){ } catch (Error e) {
status = S_IN_ERROR; status = S_IN_ERROR;
throw re; throw e;
} }
catch(Error e){
status = S_IN_ERROR;
throw e;
}
status = S_IN_ERROR; status = S_IN_ERROR;
throw new ParseException(getPosition(), ParseException.ERROR_UNEXPECTED_TOKEN, token); throw new ParseException(getPosition(), ParseException.ERROR_UNEXPECTED_TOKEN, token);
} }
} }

View File

@ -7,84 +7,82 @@ package org.json.simple.parser;
* *
*/ */
public class ParseException extends Exception { public class ParseException extends Exception {
private static final long serialVersionUID = -7880698968187728548L; private static final long serialVersionUID = -7880698968187728548L;
public static final int ERROR_UNEXPECTED_CHAR = 0;
public static final int ERROR_UNEXPECTED_TOKEN = 1;
public static final int ERROR_UNEXPECTED_EXCEPTION = 2;
private int errorType;
private Object unexpectedObject;
private int position;
public static final int ERROR_UNEXPECTED_CHAR = 0; public ParseException(int errorType) {
public static final int ERROR_UNEXPECTED_TOKEN = 1; this(-1, errorType, null);
public static final int ERROR_UNEXPECTED_EXCEPTION = 2; }
private int errorType; public ParseException(int errorType, Object unexpectedObject) {
private Object unexpectedObject; this(-1, errorType, unexpectedObject);
private int position; }
public ParseException(int errorType){ public ParseException(int position, int errorType, Object unexpectedObject) {
this(-1, errorType, null); this.position = position;
} this.errorType = errorType;
this.unexpectedObject = unexpectedObject;
}
public ParseException(int errorType, Object unexpectedObject){ public int getErrorType() {
this(-1, errorType, unexpectedObject); return errorType;
} }
public ParseException(int position, int errorType, Object unexpectedObject){ public void setErrorType(int errorType) {
this.position = position; this.errorType = errorType;
this.errorType = errorType; }
this.unexpectedObject = unexpectedObject;
}
public int getErrorType() { /**
return errorType; * @see org.json.simple.parser.JSONParser#getPosition()
} *
* @return The character position (starting with 0) of the input where the error occurs.
*/
public int getPosition() {
return position;
}
public void setErrorType(int errorType) { public void setPosition(int position) {
this.errorType = errorType; this.position = position;
} }
/** /**
* @see org.json.simple.parser.JSONParser#getPosition() * @see org.json.simple.parser.Yytoken
* *
* @return The character position (starting with 0) of the input where the error occurs. * @return One of the following base on the value of errorType:
*/ * ERROR_UNEXPECTED_CHAR java.lang.Character
public int getPosition() { * ERROR_UNEXPECTED_TOKEN org.json.simple.parser.Yytoken
return position; * ERROR_UNEXPECTED_EXCEPTION java.lang.Exception
} */
public Object getUnexpectedObject() {
return unexpectedObject;
}
public void setPosition(int position) { public void setUnexpectedObject(Object unexpectedObject) {
this.position = position; this.unexpectedObject = unexpectedObject;
} }
/** public String toString() {
* @see org.json.simple.parser.Yytoken StringBuffer sb = new StringBuffer();
*
* @return One of the following base on the value of errorType:
* ERROR_UNEXPECTED_CHAR java.lang.Character
* ERROR_UNEXPECTED_TOKEN org.json.simple.parser.Yytoken
* ERROR_UNEXPECTED_EXCEPTION java.lang.Exception
*/
public Object getUnexpectedObject() {
return unexpectedObject;
}
public void setUnexpectedObject(Object unexpectedObject) { switch (errorType) {
this.unexpectedObject = unexpectedObject; case ERROR_UNEXPECTED_CHAR:
} sb.append("Unexpected character (").append(unexpectedObject).append(") at position ").append(position).append(".");
break;
public String toString(){ case ERROR_UNEXPECTED_TOKEN:
StringBuffer sb = new StringBuffer(); sb.append("Unexpected token ").append(unexpectedObject).append(" at position ").append(position).append(".");
break;
switch(errorType){ case ERROR_UNEXPECTED_EXCEPTION:
case ERROR_UNEXPECTED_CHAR: sb.append("Unexpected exception at position ").append(position).append(": ").append(unexpectedObject);
sb.append("Unexpected character (").append(unexpectedObject).append(") at position ").append(position).append("."); break;
break; default:
case ERROR_UNEXPECTED_TOKEN: sb.append("Unkown error at position ").append(position).append(".");
sb.append("Unexpected token ").append(unexpectedObject).append(" at position ").append(position).append("."); break;
break; }
case ERROR_UNEXPECTED_EXCEPTION: return sb.toString();
sb.append("Unexpected exception at position ").append(position).append(": ").append(unexpectedObject); }
break;
default:
sb.append("Unkown error at position ").append(position).append(".");
break;
}
return sb.toString();
}
} }

File diff suppressed because it is too large Load Diff

View File

@ -8,51 +8,50 @@ package org.json.simple.parser;
* @author FangYidong<fangyidong@yahoo.com.cn> * @author FangYidong<fangyidong@yahoo.com.cn>
*/ */
public class Yytoken { public class Yytoken {
public static final int TYPE_VALUE=0;//JSON primitive value: string,number,boolean,null public static final int TYPE_VALUE = 0;//JSON primitive value: string,number,boolean,null
public static final int TYPE_LEFT_BRACE=1; public static final int TYPE_LEFT_BRACE = 1;
public static final int TYPE_RIGHT_BRACE=2; public static final int TYPE_RIGHT_BRACE = 2;
public static final int TYPE_LEFT_SQUARE=3; public static final int TYPE_LEFT_SQUARE = 3;
public static final int TYPE_RIGHT_SQUARE=4; public static final int TYPE_RIGHT_SQUARE = 4;
public static final int TYPE_COMMA=5; public static final int TYPE_COMMA = 5;
public static final int TYPE_COLON=6; public static final int TYPE_COLON = 6;
public static final int TYPE_EOF=-1;//end of file public static final int TYPE_EOF = -1;//end of file
public int type = 0;
public Object value = null;
public int type=0; public Yytoken(int type, Object value) {
public Object value=null; this.type = type;
this.value = value;
}
public Yytoken(int type,Object value){ public String toString() {
this.type=type; StringBuffer sb = new StringBuffer();
this.value=value; switch (type) {
} case TYPE_VALUE:
sb.append("VALUE(").append(value).append(")");
public String toString(){ break;
StringBuffer sb = new StringBuffer(); case TYPE_LEFT_BRACE:
switch(type){ sb.append("LEFT BRACE({)");
case TYPE_VALUE: break;
sb.append("VALUE(").append(value).append(")"); case TYPE_RIGHT_BRACE:
break; sb.append("RIGHT BRACE(})");
case TYPE_LEFT_BRACE: break;
sb.append("LEFT BRACE({)"); case TYPE_LEFT_SQUARE:
break; sb.append("LEFT SQUARE([)");
case TYPE_RIGHT_BRACE: break;
sb.append("RIGHT BRACE(})"); case TYPE_RIGHT_SQUARE:
break; sb.append("RIGHT SQUARE(])");
case TYPE_LEFT_SQUARE: break;
sb.append("LEFT SQUARE([)"); case TYPE_COMMA:
break; sb.append("COMMA(,)");
case TYPE_RIGHT_SQUARE: break;
sb.append("RIGHT SQUARE(])"); case TYPE_COLON:
break; sb.append("COLON(:)");
case TYPE_COMMA: break;
sb.append("COMMA(,)"); case TYPE_EOF:
break; sb.append("END OF FILE");
case TYPE_COLON: break;
sb.append("COLON(:)"); }
break; return sb.toString();
case TYPE_EOF: }
sb.append("END OF FILE");
break;
}
return sb.toString();
}
} }