Changeset 309 for binary-improvements/7dtd-server-fixes/src/JSON/JSONString.cs

Timestamp:

Aug 9, 2017, 7:43:07 PM (7 years ago)

Author:

alloc

Message:

Fixes 14_16_21

File:

• binary-improvements/7dtd-server-fixes/src/JSON/JSONString.cs (modified) (3 diffs)

binary-improvements/7dtd-server-fixes/src/JSON/JSONString.cs

@@ -18 +18 @@
                 }
 
-                public override string ToString (bool prettyPrint = false, int currentLevel = 0)
+                public override void ToString (StringBuilder stringBuilder, bool prettyPrint = false, int currentLevel = 0)
                 {
                         if (value == null || value.Length == 0) {
-                                return "\"\"";
+                                stringBuilder.Append ("\"\"");
+                                return;
                         }
 
                         int len = value.Length;
 
-                        StringBuilder sb = new StringBuilder (len + 4);
+                        stringBuilder.EnsureCapacity (stringBuilder.Length + 2*len);
                         String t;
+
+                        stringBuilder.Append ('"');
 
                         foreach (char c in value) {
@@ -34 +37 @@
                                         case '"':
 //                                      case '/':
-                                                sb.Append ('\\');
-                                                sb.Append (c);
+                                                stringBuilder.Append ('\\');
+                                                stringBuilder.Append (c);
                                                 break;
                                         case '\b':
-                                                sb.Append ("\\b");
+                                                stringBuilder.Append ("\\b");
                                                 break;
                                         case '\t':
-                                                sb.Append ("\\t");
+                                                stringBuilder.Append ("\\t");
                                                 break;
                                         case '\n':
-                                                sb.Append ("\\n");
+                                                stringBuilder.Append ("\\n");
                                                 break;
                                         case '\f':
-                                                sb.Append ("\\f");
+                                                stringBuilder.Append ("\\f");
                                                 break;
                                         case '\r':
-                                                sb.Append ("\\r");
+                                                stringBuilder.Append ("\\r");
                                                 break;
                                         default:
                                                 if (c < ' ') {
-                                                        t = "000" + String.Format ("X", c);
-                                                        sb.Append ("\\u" + t.Substring (t.Length - 4));
+                                                        stringBuilder.Append ("\\u");
+                                                        stringBuilder.Append (((int)c).ToString ("X4"));
                                                 } else {
-                                                        sb.Append (c);
+                                                        stringBuilder.Append (c);
                                                 }
                                                 break;
@@ -63 +66 @@
                         }
 
-                        return string.Format ("\"{0}\"", sb.ToString ());
+                        stringBuilder.Append ('"');
                 }