Changeset 351 for binary-improvements/7dtd-server-fixes/src/JSON/JSONArray.cs

Timestamp:

Jan 19, 2019, 6:12:21 PM (6 years ago)

Author:

alloc

Message:

Fixed game version compatibility of GamePrefs
Code style cleanup (mostly argument names)

File:

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

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

@@ -6 +6 @@
                 private readonly List<JSONNode> nodes = new List<JSONNode> ();
 
-                public JSONNode this [int index] {
-                        get { return nodes [index]; }
-                        set { nodes [index] = value; }
+                public JSONNode this [int _index] {
+                        get { return nodes [_index]; }
+                        set { nodes [_index] = value; }
                 }
 
@@ -15 +15 @@
                 }
 
-                public void Add (JSONNode node) {
-                        nodes.Add (node);
+                public void Add (JSONNode _node) {
+                        nodes.Add (_node);
                 }
 
-                public override void ToString (StringBuilder stringBuilder, bool prettyPrint = false, int currentLevel = 0) {
-                        stringBuilder.Append ("[");
-                        if (prettyPrint) {
-                                stringBuilder.Append ('\n');
+                public override void ToString (StringBuilder _stringBuilder, bool _prettyPrint = false, int _currentLevel = 0) {
+                        _stringBuilder.Append ("[");
+                        if (_prettyPrint) {
+                                _stringBuilder.Append ('\n');
                         }
 
                         foreach (JSONNode n in nodes) {
-                                if (prettyPrint) {
-                                        stringBuilder.Append (new string ('\t', currentLevel + 1));
+                                if (_prettyPrint) {
+                                        _stringBuilder.Append (new string ('\t', _currentLevel + 1));
                                 }
 
-                                n.ToString (stringBuilder, prettyPrint, currentLevel + 1);
-                                stringBuilder.Append (",");
-                                if (prettyPrint) {
-                                        stringBuilder.Append ('\n');
+                                n.ToString (_stringBuilder, _prettyPrint, _currentLevel + 1);
+                                _stringBuilder.Append (",");
+                                if (_prettyPrint) {
+                                        _stringBuilder.Append ('\n');
                                 }
                         }
 
                         if (nodes.Count > 0) {
-                                stringBuilder.Remove (stringBuilder.Length - (prettyPrint ? 2 : 1), 1);
+                                _stringBuilder.Remove (_stringBuilder.Length - (_prettyPrint ? 2 : 1), 1);
                         }
 
-                        if (prettyPrint) {
-                                stringBuilder.Append (new string ('\t', currentLevel));
+                        if (_prettyPrint) {
+                                _stringBuilder.Append (new string ('\t', _currentLevel));
                         }
 
-                        stringBuilder.Append ("]");
+                        _stringBuilder.Append ("]");
                 }
 
-                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 ();
 
                         bool nextElemAllowed = true;
-                        offset++;
+                        _offset++;
                         while (true) {
-                                Parser.SkipWhitespace (json, ref offset);
+                                Parser.SkipWhitespace (_json, ref _offset);
 
-                                switch (json [offset]) {
+                                switch (_json [_offset]) {
                                         case ',':
                                                 if (!nextElemAllowed) {
                                                         nextElemAllowed = true;
-                                                        offset++;
+                                                        _offset++;
                                                 } else {
                                                         throw new MalformedJSONException (
@@ -69 +69 @@
                                                 break;
                                         case ']':
-                                                offset++;
+                                                _offset++;
 
                                                 //Log.Out ("JSON:Parsed Array: " + arr.ToString ());
                                                 return arr;
                                         default:
-                                                arr.Add (Parser.ParseInternal (json, ref offset));
+                                                arr.Add (Parser.ParseInternal (_json, ref _offset));
                                                 nextElemAllowed = false;
                                                 break;