Merge pull request #16 from StaticDefault/master

Added StringWriter.

src/main/java/com/realtimetech/kson/KsonContext.java

@@ -214,7 +214,6 @@ public UUID deserialize(KsonContext ksonContext, Class<?> object, Object value)
 				return UUID.fromString((String) value);
 			}
 		});
-
 	}
 
 	private Class<?> getClassByName(String name) throws ClassNotFoundException {

src/main/java/com/realtimetech/kson/element/JsonArray.java

@@ -2,34 +2,25 @@
 
 import java.util.ArrayList;
 
+import com.realtimetech.kson.writer.KsonWriter;
+
 public class JsonArray extends ArrayList<Object> implements JsonValue {
 
 	/**
 	 * 기본 Serial UID
 	 */
 	private static final long serialVersionUID = 5513748119461105760L;
-	
-	private final StringBuffer stringBuffer = new StringBuffer();
+
+	protected KsonWriter ksonWriter = null;
 
 	@Override
 	public String toString(boolean useKsonStandard) {
-		boolean firstElement = true;
-
-		stringBuffer.setLength(0);
-
-		stringBuffer.append("[");
-		for (Object object : this) {
-			if (firstElement) {
-				firstElement = false;
-				stringBuffer.append(this.toString(object, useKsonStandard));
-			} else {
-				stringBuffer.append(",");
-				stringBuffer.append(this.toString(object, useKsonStandard));
-			}
-		}
-		stringBuffer.append("]");
-
-		return stringBuffer.toString();
+		if (ksonWriter == null)
+			this.ksonWriter = new KsonWriter();
+
+		this.ksonWriter.setUseKson(useKsonStandard);
+
+		return this.ksonWriter.toString(this);
 	}
 
 	@Override

src/main/java/com/realtimetech/kson/element/JsonObject.java

@@ -2,40 +2,25 @@
 
 import java.util.HashMap;
 
+import com.realtimetech.kson.writer.KsonWriter;
+
 public class JsonObject extends HashMap<Object, Object> implements JsonValue {
 
 	/**
 	 * 기본 Serial UID
 	 */
 	private static final long serialVersionUID = -6357620110797218097L;
-	
-	private final StringBuffer stringBuffer = new StringBuffer();
+
+	protected KsonWriter ksonWriter = null;
 
 	@Override
 	public String toString(boolean useKsonStandard) {
-		boolean firstElement = true;
+		if (ksonWriter == null)
+			this.ksonWriter = new KsonWriter();
 
-		stringBuffer.setLength(0);
+		this.ksonWriter.setUseKson(useKsonStandard);
 
-		stringBuffer.append("{");
-		for (Object key : keySet()) {
-			Object value = get(key);
-
-			if (firstElement) {
-				firstElement = false;
-				stringBuffer.append(this.toString(key, useKsonStandard));
-				stringBuffer.append(":");
-				stringBuffer.append(this.toString(value, useKsonStandard));
-			} else {
-				stringBuffer.append(",");
-				stringBuffer.append(this.toString(key, useKsonStandard));
-				stringBuffer.append(":");
-				stringBuffer.append(this.toString(value, useKsonStandard));
-			}
-		}
-		stringBuffer.append("}");
-
-		return stringBuffer.toString();
+		return this.ksonWriter.toString(this);
 	}
 
 	@Override

src/main/java/com/realtimetech/kson/element/JsonValue.java

@@ -1,10 +1,6 @@
 package com.realtimetech.kson.element;
 
-import com.realtimetech.kson.util.string.StringMaker;
-
 public interface JsonValue {
-	StringMaker stringMaker = new StringMaker();
-
 	default public String toKsonString() {
 		return toString(true);
 	}
@@ -13,79 +9,5 @@ default public String toJsonString() {
 		return toString(false);
 	}
 
-	public static String escape(String string) {
-		if (string == null) {
-			return null;
-		}
-		stringMaker.reset();
-
-		for (int i = 0; i < string.length(); i++) {
-			char character = string.charAt(i);
-			switch (character) {
-			case '"':
-				stringMaker.add('\\');
-				stringMaker.add('\"');
-				break;
-			case '\\':
-				stringMaker.add('\\');
-				stringMaker.add('\\');
-				break;
-			case '\b':
-				stringMaker.add('\\');
-				stringMaker.add('b');
-				break;
-			case '\f':
-				stringMaker.add('\\');
-				stringMaker.add('f');
-				break;
-			case '\n':
-				stringMaker.add('\\');
-				stringMaker.add('n');
-				break;
-			case '\r':
-				stringMaker.add('\\');
-				stringMaker.add('r');
-				break;
-			case '\t':
-				stringMaker.add('\\');
-				stringMaker.add('t');
-				break;
-			default:
-				stringMaker.add(character);
-			}
-		}
-
-		return stringMaker.toString();
-	}
-
-	default public String toString(Object object, boolean useKsonStandard) {
-		if (object == null)
-			return "null";
-
-		if (object instanceof JsonValue) {
-			JsonValue ksonValue = (JsonValue) object;
-			return ksonValue.toString(useKsonStandard);
-		} else if (object instanceof String) {
-			String string = (String) object;
-			return "\"" + escape(string) + "\"";
-		} else {
-			if (useKsonStandard) {
-				if (object instanceof Float) {
-					return object + "F";
-				} else if (object instanceof Double) {
-					return object + "D";
-				} else if (object instanceof Long) {
-					return object + "L";
-				} else if (object instanceof Byte) {
-					return object + "B";
-				} else {
-					return object.toString();
-				}
-			} else {
-				return object.toString();
-			}
-		}
-	}
-
 	public String toString(boolean useKsonStandard);
 }

src/main/java/com/realtimetech/kson/util/stack/FastStack.java

@@ -9,6 +9,8 @@ public class FastStack<T> {
 
 	private int currentIndex;
 	private int scope;
+
+	private int startIndex;
 
 	public FastStack() {
 		this(10);
@@ -17,6 +19,7 @@ public FastStack() {
 	public FastStack(int raiseSize) {
 		this.raiseSize = raiseSize;
 		this.currentIndex = -1;
+		this.startIndex = 0;
 		this.scope = 0;
 
 		this.raiseArrays();
@@ -46,6 +49,10 @@ public void push(T object) {
 		this.objects[this.currentIndex] = object;
 	}
 
+	public T[] getArray() {
+		return objects;
+	}
+
 	public boolean isEmpty() {
 		return this.currentIndex == -1;
 	}
@@ -69,8 +76,16 @@ public T pop() {
 		return object;
 	}
 
+	public T shift() {
+		if (this.currentIndex == -1)
+			throw new EmptyStackException();
+
+		return this.objects[this.startIndex++];
+	}
+
 	public void reset() {
 		this.currentIndex = -1;
+		this.startIndex = 0;
 	}
 
 	public int getSize() {

src/main/java/com/realtimetech/kson/util/string/StringMaker.java

@@ -1,5 +1,7 @@
 package com.realtimetech.kson.util.string;
 
+import java.util.Arrays;
+
 public class StringMaker {
 	private int raiseSize;
 
@@ -55,6 +57,10 @@ public void remove() {
 		this.currentIndex--;
 	}
 
+	public char[] toArray() {
+		return Arrays.copyOfRange(chars, 0, this.currentIndex + 1);
+	}
+
 	public String toString() {
 		return new String(chars, 0, this.currentIndex + 1);
 	}