the big refactor + extracted data classes from coders/json to data/dynamic

src/coders/json.h

@@ -8,122 +8,34 @@
 #include <unordered_map>
 
 #include "commons.h"
+#include "../typedefs.h"
 
-typedef unsigned int uint;
+#include "binary_json.h"
+
+namespace dynamic {
+    class Map;
+    class List;
+    class Value;
+}
 
 namespace json {
-    class JObject;
-    class JArray;
-    class Value;
-
-    extern std::string stringify(const JObject* obj, bool nice, const std::string& indent);
-    extern std::vector<ubyte> to_binary(const JObject* obj);
-    extern JObject* from_binary(const ubyte* src, size_t size);
-
-    enum class valtype {
-        object, array, number, integer, string, boolean
-    };
-
-    union valvalue {
-        JObject* obj;
-        JArray* arr;
-        std::string* str;
-        double decimal;
-        int64_t integer;
-        bool boolean;
-    };
-
-    class Value {
-    public:
-        valtype type;
-        valvalue value;
-        Value(valtype type, valvalue value);
-        ~Value();
-    };
-
-    class JArray {
-    public:
-        std::vector<Value*> values;
-        ~JArray();
-
-        std::string str(size_t index) const;
-        double num(size_t index) const;
-        int64_t integer(size_t num) const;
-        JObject* obj(size_t index) const;
-        JArray* arr(size_t index) const;
-        bool flag(size_t index) const;
-
-        inline size_t size() const {
-            return values.size();
-        }
-
-        JArray& put(uint value);
-        JArray& put(int value);
-        JArray& put(uint64_t value);
-        JArray& put(int64_t value);
-        JArray& put(float value);
-        JArray& put(double value);
-        JArray& put(std::string value);
-        JArray& put(JObject* value);
-        JArray& put(JArray* value);
-        JArray& put(bool value);
-
-        JArray& putArray();
-        JObject& putObj();
-
-        void remove(size_t index);
-    };
-
-    class JObject {
-    public:
-        std::unordered_map<std::string, Value*> map;
-        ~JObject();
-
-        std::string getStr(std::string key, const std::string& def) const;
-        double getNum(std::string key, double def) const;
-        int64_t getInteger(std::string key, int64_t def) const;
-        void str(std::string key, std::string& dst) const;
-        void num(std::string key, int& dst) const;
-        void num(std::string key, float& dst) const;
-        void num(std::string key, uint& dst) const;
-        void num(std::string key, int64_t& dst) const;
-        void num(std::string key, uint64_t& dst) const;
-        void num(std::string key, ubyte& dst) const;
-        void num(std::string key, double& dst) const;
-        JObject* obj(std::string key) const;
-        JArray* arr(std::string key) const;
-        void flag(std::string key, bool& dst) const;
-
-        JObject& put(std::string key, uint value);
-        JObject& put(std::string key, int value);
-        JObject& put(std::string key, int64_t value);
-        JObject& put(std::string key, uint64_t value);
-        JObject& put(std::string key, float value);
-        JObject& put(std::string key, double value);
-        JObject& put(std::string key, const char* value);
-        JObject& put(std::string key, std::string value);
-        JObject& put(std::string key, JObject* value);
-        JObject& put(std::string key, JArray* value);
-        JObject& put(std::string key, bool value);
-
-        JArray& putArray(std::string key);
-        JObject& putObj(std::string key);
-
-        bool has(std::string key);
-    };
-
     class Parser : public BasicParser {
-        JArray* parseArray();
-        JObject* parseObject();
-        Value* parseValue();
+        dynamic::List* parseList();
+        dynamic::Map* parseObject();
+        dynamic::Value* parseValue();
     public:
         Parser(std::string filename, std::string source);
         
-        JObject* parse();
+        dynamic::Map* parse();
     };
 
-    extern JObject* parse(std::string filename, std::string source);
-    extern JObject* parse(std::string source);
+    extern std::unique_ptr<dynamic::Map> parse(std::string filename, std::string source);
+    extern std::unique_ptr<dynamic::Map> parse(std::string source);
+
+    extern std::string stringify(
+        const dynamic::Map* obj, 
+        bool nice, 
+        const std::string& indent);
 }
 
 #endif // CODERS_JSON_H_