![(please configure the [header_logo] section in trac.ini)](/chrome/site/your_project_logo.png){kind=logo}
Changeset 309 for binary-improvements/7dtd-server-fixes/src
- Timestamp:
- Aug 9, 2017, 7:43:07 PM (7 years ago)
- Location:
- binary-improvements/7dtd-server-fixes/src/JSON
- Files:
-
- 7 edited
-
JSONArray.cs (modified) (1 diff)
-
JSONBoolean.cs (modified) (2 diffs)
-
JSONNode.cs (modified) (2 diffs)
-
JSONNull.cs (modified) (2 diffs)
-
JSONNumber.cs (modified) (2 diffs)
-
JSONObject.cs (modified) (1 diff)
-
JSONString.cs (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
binary-improvements/7dtd-server-fixes/src/JSON/JSONArray.cs
r187 r309 23 23 } 24 24 25 public override string ToString (bool prettyPrint = false, int currentLevel = 0)25 public override void ToString (StringBuilder stringBuilder, bool prettyPrint = false, int currentLevel = 0) 26 26 { 27 StringBuilder sb = new StringBuilder("[");27 stringBuilder.Append ("["); 28 28 if (prettyPrint) 29 s b.Append ('\n');29 stringBuilder.Append ('\n'); 30 30 foreach (JSONNode n in nodes) { 31 31 if (prettyPrint) 32 s b.Append (new String ('\t', currentLevel + 1));33 sb.Append (n.ToString (prettyPrint, currentLevel + 1));34 s b.Append (",");32 stringBuilder.Append (new String ('\t', currentLevel + 1)); 33 n.ToString (stringBuilder, prettyPrint, currentLevel + 1); 34 stringBuilder.Append (","); 35 35 if (prettyPrint) 36 s b.Append ('\n');36 stringBuilder.Append ('\n'); 37 37 } 38 if (s b.Length > 1)39 s b.Remove (sb.Length - (prettyPrint ? 2 : 1), 1);38 if (stringBuilder.Length > 1) 39 stringBuilder.Remove (stringBuilder.Length - (prettyPrint ? 2 : 1), 1); 40 40 if (prettyPrint) 41 sb.Append (new String ('\t', currentLevel)); 42 sb.Append ("]"); 43 return sb.ToString (); 41 stringBuilder.Append (new String ('\t', currentLevel)); 42 stringBuilder.Append ("]"); 44 43 } 45 44 -
binary-improvements/7dtd-server-fixes/src/JSON/JSONBoolean.cs
r279 r309 1 1 using System; 2 using System.Text; 2 3 3 4 namespace AllocsFixes.JSON … … 17 18 } 18 19 19 public override string ToString (bool prettyPrint = false, int currentLevel = 0)20 public override void ToString (StringBuilder stringBuilder, bool prettyPrint = false, int currentLevel = 0) 20 21 { 21 return value.ToString (System.Globalization.CultureInfo.InvariantCulture).ToLower ();22 stringBuilder.Append (value ? "true" : "false"); 22 23 } 23 24 -
binary-improvements/7dtd-server-fixes/src/JSON/JSONNode.cs
r187 r309 1 1 using System; 2 using System.Text; 2 3 3 4 namespace AllocsFixes.JSON … … 5 6 public abstract class JSONNode 6 7 { 7 public abstract string ToString(bool prettyPrint = false, int currentLevel = 0); 8 public abstract void ToString(StringBuilder stringBuilder, bool prettyPrint = false, int currentLevel = 0); 9 10 public override string ToString () { 11 StringBuilder sb = new StringBuilder (); 12 ToString (sb); 13 return sb.ToString (); 14 } 8 15 } 9 16 } 10 -
binary-improvements/7dtd-server-fixes/src/JSON/JSONNull.cs
r279 r309 1 1 using System; 2 using System.Text; 2 3 3 4 namespace AllocsFixes.JSON … … 9 10 } 10 11 11 public override string ToString (bool prettyPrint = false, int currentLevel = 0)12 public override void ToString (StringBuilder stringBuilder, bool prettyPrint = false, int currentLevel = 0) 12 13 { 13 return "null";14 stringBuilder.Append ("null"); 14 15 } 15 16 -
binary-improvements/7dtd-server-fixes/src/JSON/JSONNumber.cs
r279 r309 23 23 } 24 24 25 public override string ToString (bool prettyPrint = false, int currentLevel = 0)25 public override void ToString (StringBuilder stringBuilder, bool prettyPrint = false, int currentLevel = 0) 26 26 { 27 return value.ToString (System.Globalization.CultureInfo.InvariantCulture);27 stringBuilder.Append (value.ToCultureInvariantString ()); 28 28 } 29 29 … … 86 86 } else { 87 87 double number; 88 if (! double.TryParse(sbNum.ToString (), out number)) {88 if (!Utils.TryParseDouble(sbNum.ToString (), out number)) { 89 89 throw new MalformedJSONException ("Mantissa is not a valid decimal (\"" + sbNum.ToString () + "\")"); 90 90 } -
binary-improvements/7dtd-server-fixes/src/JSON/JSONObject.cs
r187 r309 32 32 } 33 33 34 public override string ToString (bool prettyPrint = false, int currentLevel = 0)34 public override void ToString (StringBuilder stringBuilder, bool prettyPrint = false, int currentLevel = 0) 35 35 { 36 StringBuilder sb = new StringBuilder("{");36 stringBuilder.Append ("{"); 37 37 if (prettyPrint) 38 s b.Append ('\n');38 stringBuilder.Append ('\n'); 39 39 foreach (KeyValuePair<string, JSONNode> kvp in nodes) { 40 40 if (prettyPrint) 41 s b.Append (new String ('\t', currentLevel + 1));42 s b.Append (String.Format ("\"{0}\":", kvp.Key));41 stringBuilder.Append (new String ('\t', currentLevel + 1)); 42 stringBuilder.Append (String.Format ("\"{0}\":", kvp.Key)); 43 43 if (prettyPrint) 44 s b.Append (" ");45 sb.Append (kvp.Value.ToString (prettyPrint, currentLevel + 1));46 s b.Append (",");44 stringBuilder.Append (" "); 45 kvp.Value.ToString (stringBuilder, prettyPrint, currentLevel + 1); 46 stringBuilder.Append (","); 47 47 if (prettyPrint) 48 s b.Append ('\n');48 stringBuilder.Append ('\n'); 49 49 } 50 if (s b.Length > 1)51 s b.Remove (sb.Length - (prettyPrint ? 2 : 1), 1);50 if (stringBuilder.Length > 1) 51 stringBuilder.Remove (stringBuilder.Length - (prettyPrint ? 2 : 1), 1); 52 52 if (prettyPrint) 53 sb.Append (new String ('\t', currentLevel)); 54 sb.Append ("}"); 55 return sb.ToString (); 53 stringBuilder.Append (new String ('\t', currentLevel)); 54 stringBuilder.Append ("}"); 56 55 } 57 56 -
binary-improvements/7dtd-server-fixes/src/JSON/JSONString.cs
r306 r309 18 18 } 19 19 20 public override string ToString (bool prettyPrint = false, int currentLevel = 0)20 public override void ToString (StringBuilder stringBuilder, bool prettyPrint = false, int currentLevel = 0) 21 21 { 22 22 if (value == null || value.Length == 0) { 23 return "\"\""; 23 stringBuilder.Append ("\"\""); 24 return; 24 25 } 25 26 26 27 int len = value.Length; 27 28 28 StringBuilder sb = new StringBuilder (len + 4);29 stringBuilder.EnsureCapacity (stringBuilder.Length + 2*len); 29 30 String t; 31 32 stringBuilder.Append ('"'); 30 33 31 34 foreach (char c in value) { … … 34 37 case '"': 35 38 // case '/': 36 s b.Append ('\\');37 s b.Append (c);39 stringBuilder.Append ('\\'); 40 stringBuilder.Append (c); 38 41 break; 39 42 case '\b': 40 s b.Append ("\\b");43 stringBuilder.Append ("\\b"); 41 44 break; 42 45 case '\t': 43 s b.Append ("\\t");46 stringBuilder.Append ("\\t"); 44 47 break; 45 48 case '\n': 46 s b.Append ("\\n");49 stringBuilder.Append ("\\n"); 47 50 break; 48 51 case '\f': 49 s b.Append ("\\f");52 stringBuilder.Append ("\\f"); 50 53 break; 51 54 case '\r': 52 s b.Append ("\\r");55 stringBuilder.Append ("\\r"); 53 56 break; 54 57 default: 55 58 if (c < ' ') { 56 t = "000" + String.Format ("X", c);57 s b.Append ("\\u" + t.Substring (t.Length - 4));59 stringBuilder.Append ("\\u"); 60 stringBuilder.Append (((int)c).ToString ("X4")); 58 61 } else { 59 s b.Append (c);62 stringBuilder.Append (c); 60 63 } 61 64 break; … … 63 66 } 64 67 65 return string.Format ("\"{0}\"", sb.ToString ());68 stringBuilder.Append ('"'); 66 69 } 67 70
Note:
See TracChangeset
for help on using the changeset viewer.
