Index: binary-improvements2/7dtd-server-fixes/src/JSON/JSONArray.cs =================================================================== --- binary-improvements2/7dtd-server-fixes/src/JSON/JSONArray.cs (revision 389) +++ binary-improvements2/7dtd-server-fixes/src/JSON/JSONArray.cs (revision 391) @@ -3,17 +3,15 @@ namespace AllocsFixes.JSON { - public class JSONArray : JSONNode { - private readonly List nodes = new List (); + public class JsonArray : JsonNode { + private readonly List nodes = new List (); - public JSONNode this [int _index] { - get { return nodes [_index]; } - set { nodes [_index] = value; } + public JsonNode this [int _index] { + get => nodes [_index]; + set => nodes [_index] = value; } - public int Count { - get { return nodes.Count; } - } + public int Count => nodes.Count; - public void Add (JSONNode _node) { + public void Add (JsonNode _node) { nodes.Add (_node); } @@ -25,5 +23,5 @@ } - foreach (JSONNode n in nodes) { + foreach (JsonNode n in nodes) { if (_prettyPrint) { _stringBuilder.Append (new string ('\t', _currentLevel + 1)); @@ -48,7 +46,7 @@ } - public static JSONArray Parse (string _json, ref int _offset) { + public static JsonArray Parse (string _json, ref int _offset) { //Log.Out ("ParseArray enter (" + offset + ")"); - JSONArray arr = new JSONArray (); + JsonArray arr = new JsonArray (); bool nextElemAllowed = true; @@ -63,5 +61,5 @@ _offset++; } else { - throw new MalformedJSONException ( + throw new MalformedJsonException ( "Could not parse array, found a comma without a value first"); } Index: binary-improvements2/7dtd-server-fixes/src/JSON/JSONBoolean.cs =================================================================== --- binary-improvements2/7dtd-server-fixes/src/JSON/JSONBoolean.cs (revision 389) +++ binary-improvements2/7dtd-server-fixes/src/JSON/JSONBoolean.cs (revision 391) @@ -2,8 +2,8 @@ namespace AllocsFixes.JSON { - public class JSONBoolean : JSONValue { + public class JsonBoolean : JsonValue { private readonly bool value; - public JSONBoolean (bool _value) { + public JsonBoolean (bool _value) { value = _value; } @@ -17,5 +17,5 @@ } - public static JSONBoolean Parse (string _json, ref int _offset) { + public static JsonBoolean Parse (string _json, ref int _offset) { //Log.Out ("ParseBool enter (" + offset + ")"); @@ -23,5 +23,5 @@ //Log.Out ("JSON:Parsed Bool: true"); _offset += 4; - return new JSONBoolean (true); + return new JsonBoolean (true); } @@ -29,8 +29,8 @@ //Log.Out ("JSON:Parsed Bool: false"); _offset += 5; - return new JSONBoolean (false); + return new JsonBoolean (false); } - throw new MalformedJSONException ("No valid boolean found"); + throw new MalformedJsonException ("No valid boolean found"); } Index: binary-improvements2/7dtd-server-fixes/src/JSON/JSONNode.cs =================================================================== --- binary-improvements2/7dtd-server-fixes/src/JSON/JSONNode.cs (revision 389) +++ binary-improvements2/7dtd-server-fixes/src/JSON/JSONNode.cs (revision 391) @@ -2,5 +2,5 @@ namespace AllocsFixes.JSON { - public abstract class JSONNode { + public abstract class JsonNode { public abstract void ToString (StringBuilder _stringBuilder, bool _prettyPrint = false, int _currentLevel = 0); Index: binary-improvements2/7dtd-server-fixes/src/JSON/JSONNull.cs =================================================================== --- binary-improvements2/7dtd-server-fixes/src/JSON/JSONNull.cs (revision 389) +++ binary-improvements2/7dtd-server-fixes/src/JSON/JSONNull.cs (revision 391) @@ -3,19 +3,19 @@ namespace AllocsFixes.JSON { - public class JSONNull : JSONValue { + public class JsonNull : JsonValue { public override void ToString (StringBuilder _stringBuilder, bool _prettyPrint = false, int _currentLevel = 0) { _stringBuilder.Append ("null"); } - public static JSONNull Parse (string _json, ref int _offset) { + public static JsonNull Parse (string _json, ref int _offset) { //Log.Out ("ParseNull enter (" + offset + ")"); if (!_json.Substring (_offset, 4).Equals ("null")) { - throw new MalformedJSONException ("No valid null value found"); + throw new MalformedJsonException ("No valid null value found"); } //Log.Out ("JSON:Parsed Null"); _offset += 4; - return new JSONNull (); + return new JsonNull (); } Index: binary-improvements2/7dtd-server-fixes/src/JSON/JSONNumber.cs =================================================================== --- binary-improvements2/7dtd-server-fixes/src/JSON/JSONNumber.cs (revision 389) +++ binary-improvements2/7dtd-server-fixes/src/JSON/JSONNumber.cs (revision 391) @@ -3,8 +3,8 @@ namespace AllocsFixes.JSON { - public class JSONNumber : JSONValue { + public class JsonNumber : JsonValue { private readonly double value; - public JSONNumber (double _value) { + public JsonNumber (double _value) { value = _value; } @@ -22,5 +22,5 @@ } - public static JSONNumber Parse (string _json, ref int _offset) { + public static JsonNumber Parse (string _json, ref int _offset) { //Log.Out ("ParseNumber enter (" + offset + ")"); StringBuilder sbNum = new StringBuilder (); @@ -37,13 +37,13 @@ } else if (_json [_offset] == '.') { if (hasExp) { - throw new MalformedJSONException ("Decimal separator in exponent"); + throw new MalformedJsonException ("Decimal separator in exponent"); } if (hasDec) { - throw new MalformedJSONException ("Multiple decimal separators in number found"); + throw new MalformedJsonException ("Multiple decimal separators in number found"); } if (sbNum.Length == 0) { - throw new MalformedJSONException ("No leading digits before decimal separator found"); + throw new MalformedJsonException ("No leading digits before decimal separator found"); } @@ -53,5 +53,5 @@ if (hasExp) { if (sbExp.Length > 0) { - throw new MalformedJSONException ("Negative sign in exponent after digits"); + throw new MalformedJsonException ("Negative sign in exponent after digits"); } @@ -59,5 +59,5 @@ } else { if (sbNum.Length > 0) { - throw new MalformedJSONException ("Negative sign in mantissa after digits"); + throw new MalformedJsonException ("Negative sign in mantissa after digits"); } @@ -66,9 +66,9 @@ } else if (_json [_offset] == 'e' || _json [_offset] == 'E') { if (hasExp) { - throw new MalformedJSONException ("Multiple exponential markers in number found"); + throw new MalformedJsonException ("Multiple exponential markers in number found"); } if (sbNum.Length == 0) { - throw new MalformedJSONException ("No leading digits before exponential marker found"); + throw new MalformedJsonException ("No leading digits before exponential marker found"); } @@ -78,28 +78,26 @@ if (hasExp) { if (sbExp.Length > 0) { - throw new MalformedJSONException ("Positive sign in exponent after digits"); + throw new MalformedJsonException ("Positive sign in exponent after digits"); } sbExp.Append (_json [_offset]); } else { - throw new MalformedJSONException ("Positive sign in mantissa found"); + throw new MalformedJsonException ("Positive sign in mantissa found"); } } else { - double number; - if (!StringParsers.TryParseDouble (sbNum.ToString (), out number)) { - throw new MalformedJSONException ("Mantissa is not a valid decimal (\"" + sbNum + "\")"); + if (!StringParsers.TryParseDouble (sbNum.ToString (), out double number)) { + throw new MalformedJsonException ("Mantissa is not a valid decimal (\"" + sbNum + "\")"); } if (hasExp) { - int exp; - if (!int.TryParse (sbExp.ToString (), out exp)) { - throw new MalformedJSONException ("Exponent is not a valid integer (\"" + sbExp + "\")"); + if (!int.TryParse (sbExp.ToString (), out int exp)) { + throw new MalformedJsonException ("Exponent is not a valid integer (\"" + sbExp + "\")"); } - number = number * Math.Pow (10, exp); + number *= Math.Pow (10, exp); } //Log.Out ("JSON:Parsed Number: " + number.ToString ()); - return new JSONNumber (number); + return new JsonNumber (number); } @@ -107,5 +105,5 @@ } - throw new MalformedJSONException ("End of JSON reached before parsing number finished"); + throw new MalformedJsonException ("End of JSON reached before parsing number finished"); } Index: binary-improvements2/7dtd-server-fixes/src/JSON/JSONObject.cs =================================================================== --- binary-improvements2/7dtd-server-fixes/src/JSON/JSONObject.cs (revision 389) +++ binary-improvements2/7dtd-server-fixes/src/JSON/JSONObject.cs (revision 391) @@ -3,8 +3,8 @@ namespace AllocsFixes.JSON { - public class JSONObject : JSONNode { - private readonly Dictionary nodes = new Dictionary (); + public class JsonObject : JsonNode { + private readonly Dictionary nodes = new Dictionary (); - public JSONNode this [string _name] { + public JsonNode this [string _name] { get => nodes [_name]; set => nodes [_name] = value; @@ -19,9 +19,9 @@ } - public bool TryGetValue (string _name, out JSONNode _node) { + public bool TryGetValue (string _name, out JsonNode _node) { return nodes.TryGetValue (_name, out _node); } - public void Add (string _name, JSONNode _node) { + public void Add (string _name, JsonNode _node) { nodes.Add (_name, _node); } @@ -33,15 +33,15 @@ } - foreach (KeyValuePair kvp in nodes) { + foreach ((string key, JsonNode value) in nodes) { if (_prettyPrint) { _stringBuilder.Append (new string ('\t', _currentLevel + 1)); } - _stringBuilder.Append (string.Format ("\"{0}\":", kvp.Key)); + _stringBuilder.Append ($"\"{key}\":"); if (_prettyPrint) { _stringBuilder.Append (" "); } - kvp.Value.ToString (_stringBuilder, _prettyPrint, _currentLevel + 1); + value.ToString (_stringBuilder, _prettyPrint, _currentLevel + 1); _stringBuilder.Append (","); if (_prettyPrint) { @@ -61,7 +61,7 @@ } - public static JSONObject Parse (string _json, ref int _offset) { + public static JsonObject Parse (string _json, ref int _offset) { //Log.Out ("ParseObject enter (" + offset + ")"); - JSONObject obj = new JSONObject (); + JsonObject obj = new JsonObject (); bool nextElemAllowed = true; @@ -72,17 +72,17 @@ case '"': if (nextElemAllowed) { - JSONString key = JSONString.Parse (_json, ref _offset); + JsonString key = JsonString.Parse (_json, ref _offset); Parser.SkipWhitespace (_json, ref _offset); if (_json [_offset] != ':') { - throw new MalformedJSONException ( + throw new MalformedJsonException ( "Could not parse object, missing colon (\":\") after key"); } _offset++; - JSONNode val = Parser.ParseInternal (_json, ref _offset); + JsonNode val = Parser.ParseInternal (_json, ref _offset); obj.Add (key.GetString (), val); nextElemAllowed = false; } else { - throw new MalformedJSONException ( + throw new MalformedJsonException ( "Could not parse object, found new key without a separating comma"); } @@ -94,5 +94,5 @@ _offset++; } else { - throw new MalformedJSONException ( + throw new MalformedJsonException ( "Could not parse object, found a comma without a key/value pair first"); } Index: binary-improvements2/7dtd-server-fixes/src/JSON/JSONString.cs =================================================================== --- binary-improvements2/7dtd-server-fixes/src/JSON/JSONString.cs (revision 389) +++ binary-improvements2/7dtd-server-fixes/src/JSON/JSONString.cs (revision 391) @@ -2,8 +2,8 @@ namespace AllocsFixes.JSON { - public class JSONString : JSONValue { + public class JsonString : JsonValue { private readonly string value; - public JSONString (string _value) { + public JsonString (string _value) { value = _value; } @@ -14,5 +14,5 @@ public override void ToString (StringBuilder _stringBuilder, bool _prettyPrint = false, int _currentLevel = 0) { - if (value == null || value.Length == 0) { + if (string.IsNullOrEmpty (value)) { _stringBuilder.Append ("\"\""); return; @@ -64,5 +64,5 @@ } - public static JSONString Parse (string _json, ref int _offset) { + public static JsonString Parse (string _json, ref int _offset) { //Log.Out ("ParseString enter (" + offset + ")"); StringBuilder sb = new StringBuilder (); @@ -104,5 +104,5 @@ //Log.Out ("JSON:Parsed String: " + sb.ToString ()); - return new JSONString (sb.ToString ()); + return new JsonString (sb.ToString ()); default: sb.Append (_json [_offset]); @@ -112,5 +112,5 @@ } - throw new MalformedJSONException ("End of JSON reached before parsing string finished"); + throw new MalformedJsonException ("End of JSON reached before parsing string finished"); } Index: binary-improvements2/7dtd-server-fixes/src/JSON/JSONValue.cs =================================================================== --- binary-improvements2/7dtd-server-fixes/src/JSON/JSONValue.cs (revision 389) +++ binary-improvements2/7dtd-server-fixes/src/JSON/JSONValue.cs (revision 391) @@ -1,4 +1,4 @@ namespace AllocsFixes.JSON { - public abstract class JSONValue : JSONNode { + public abstract class JsonValue : JsonNode { public abstract string AsString { get; } public abstract int AsInt { get; } Index: binary-improvements2/7dtd-server-fixes/src/JSON/JsonManualBuilder.cs =================================================================== --- binary-improvements2/7dtd-server-fixes/src/JSON/JsonManualBuilder.cs (revision 389) +++ binary-improvements2/7dtd-server-fixes/src/JSON/JsonManualBuilder.cs (revision 391) @@ -9,5 +9,5 @@ NonEmpty = 1, Object = 2, - Array = 4, + Array = 4 } @@ -20,20 +20,12 @@ private int currentLevelNumber; - private ELevelInfo CurrentLevelInfo { - get { return (ELevelInfo) (currentLevelType & levelBitsMask); } - } - - private bool CurrentLevelIsNonEmpty { - get { return (CurrentLevelInfo & ELevelInfo.NonEmpty) == ELevelInfo.NonEmpty; } - } - - private bool CurrentLevelIsArray { - get { return (CurrentLevelInfo & ELevelInfo.Array) != ELevelInfo.Array; } - } - - private bool CurrentLevelIsObject { - get { return (CurrentLevelInfo & ELevelInfo.Object) != ELevelInfo.Object; } - } - + private ELevelInfo CurrentLevelInfo => (ELevelInfo) (currentLevelType & levelBitsMask); + + private bool CurrentLevelIsNonEmpty => (CurrentLevelInfo & ELevelInfo.NonEmpty) == ELevelInfo.NonEmpty; + + private bool CurrentLevelIsArray => (CurrentLevelInfo & ELevelInfo.Array) != ELevelInfo.Array; + + private bool CurrentLevelIsObject => (CurrentLevelInfo & ELevelInfo.Object) != ELevelInfo.Object; + public JsonManualBuilder (bool _prettyPrint) { prettyPrint = _prettyPrint; @@ -54,5 +46,5 @@ } - currentLevelType = currentLevelType | (long) ELevelInfo.NonEmpty; + currentLevelType |= (long) ELevelInfo.NonEmpty; } @@ -210,5 +202,5 @@ currentLevelNumber--; - currentLevelType = currentLevelType >> levelTypeBits; + currentLevelType >>= levelTypeBits; if (prettyPrint) { Index: binary-improvements2/7dtd-server-fixes/src/JSON/MalformedJSONException.cs =================================================================== --- binary-improvements2/7dtd-server-fixes/src/JSON/MalformedJSONException.cs (revision 389) +++ binary-improvements2/7dtd-server-fixes/src/JSON/MalformedJSONException.cs (revision 391) @@ -3,15 +3,15 @@ namespace AllocsFixes.JSON { - public class MalformedJSONException : ApplicationException { - public MalformedJSONException () { + public class MalformedJsonException : ApplicationException { + public MalformedJsonException () { } - public MalformedJSONException (string _message) : base (_message) { + public MalformedJsonException (string _message) : base (_message) { } - public MalformedJSONException (string _message, Exception _inner) : base (_message, _inner) { + public MalformedJsonException (string _message, Exception _inner) : base (_message, _inner) { } - protected MalformedJSONException (SerializationInfo _info, StreamingContext _context) : base (_info, _context) { + protected MalformedJsonException (SerializationInfo _info, StreamingContext _context) : base (_info, _context) { } } Index: binary-improvements2/7dtd-server-fixes/src/JSON/Parser.cs =================================================================== --- binary-improvements2/7dtd-server-fixes/src/JSON/Parser.cs (revision 389) +++ binary-improvements2/7dtd-server-fixes/src/JSON/Parser.cs (revision 391) @@ -1,10 +1,10 @@ namespace AllocsFixes.JSON { - public class Parser { - public static JSONNode Parse (string _json) { + public static class Parser { + public static JsonNode Parse (string _json) { int offset = 0; return ParseInternal (_json, ref offset); } - public static JSONNode ParseInternal (string _json, ref int _offset) { + public static JsonNode ParseInternal (string _json, ref int _offset) { SkipWhitespace (_json, ref _offset); @@ -12,16 +12,16 @@ switch (_json [_offset]) { case '[': - return JSONArray.Parse (_json, ref _offset); + return JsonArray.Parse (_json, ref _offset); case '{': - return JSONObject.Parse (_json, ref _offset); + return JsonObject.Parse (_json, ref _offset); case '"': - return JSONString.Parse (_json, ref _offset); + return JsonString.Parse (_json, ref _offset); case 't': case 'f': - return JSONBoolean.Parse (_json, ref _offset); + return JsonBoolean.Parse (_json, ref _offset); case 'n': - return JSONNull.Parse (_json, ref _offset); + return JsonNull.Parse (_json, ref _offset); default: - return JSONNumber.Parse (_json, ref _offset); + return JsonNumber.Parse (_json, ref _offset); } } @@ -42,5 +42,5 @@ } - throw new MalformedJSONException ("End of JSON reached before parsing finished"); + throw new MalformedJsonException ("End of JSON reached before parsing finished"); } }