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

Timestamp:

Sep 10, 2014, 8:09:28 PM (10 years ago)

Author:

alloc

Message:

fixes

File:

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

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

@@ -9 +9 @@
                 private List<JSONNode> nodes = new List<JSONNode> ();
 
+                public JSONNode this [int index] {
+                        get { return nodes [index]; }
+                        set { nodes [index] = value; }
+                }
+
+                public int Count {
+                        get { return nodes.Count; }
+                }
+
                 public void Add (JSONNode node)
                 {
-                        nodes.Add(node);
+                        nodes.Add (node);
                 }
 
-                public override string ToString ()
+                public override string ToString (bool prettyPrint = false, int currentLevel = 0)
                 {
                         StringBuilder sb = new StringBuilder ("[");
+                        if (prettyPrint)
+                                sb.Append ('\n');
                         foreach (JSONNode n in nodes) {
-                                sb.Append (n.ToString ());
+                                if (prettyPrint)
+                                        sb.Append (new String ('\t', currentLevel + 1));
+                                sb.Append (n.ToString (prettyPrint, currentLevel + 1));
                                 sb.Append (",");
+                                if (prettyPrint)
+                                        sb.Append ('\n');
                         }
                         if (sb.Length > 1)
-                                sb.Remove (sb.Length - 1, 1);
+                                sb.Remove (sb.Length - (prettyPrint ? 2 : 1), 1);
+                        if (prettyPrint)
+                                sb.Append (new String ('\t', currentLevel));
                         sb.Append ("]");
                         return sb.ToString ();
+                }
+
+                public static JSONArray Parse (string json, ref int offset)
+                {
+                        //Log.Out ("ParseArray enter (" + offset + ")");
+                        JSONArray arr = new JSONArray ();
+
+                        bool nextElemAllowed = true;
+                        offset++;
+                        while (true) {
+                                Parser.SkipWhitespace (json, ref offset);
+
+                                switch (json [offset]) {
+                                        case ',':
+                                                if (!nextElemAllowed) {
+                                                        nextElemAllowed = true;
+                                                        offset++;
+                                                } else
+                                                        throw new MalformedJSONException ("Could not parse array, found a comma without a value first");
+                                                break;
+                                        case ']':
+                                                offset++;
+                                                //Log.Out ("JSON:Parsed Array: " + arr.ToString ());
+                                                return arr;
+                                        default:
+                                                arr.Add (Parser.ParseInternal (json, ref offset));
+                                                nextElemAllowed = false;
+                                                break;
+                                }
+                        }
                 }