Merge pull request #11294 from karroffel/json-object

added JSON singleton

1 files changed, 74 insertions, 0 deletions

diff --git a/core/bind/core_bind.cpp b/core/bind/core_bind.cpp
index ab9c107d7a..cfd7677d6b 100644
--- a/core/bind/core_bind.cpp
+++ b/core/bind/core_bind.cpp
@@ -33,6 +33,7 @@
 #include "geometry.h"
 #include "io/file_access_compressed.h"
 #include "io/file_access_encrypted.h"
+#include "io/json.h"
 #include "io/marshalls.h"
 #include "os/keyboard.h"
 #include "os/os.h"
@@ -2600,3 +2601,76 @@ _Engine *_Engine::singleton = NULL;
 _Engine::_Engine() {
 	singleton = this;
 }
+
+void JSONParseResult::_bind_methods() {
+	ClassDB::bind_method(D_METHOD("get_error"), &JSONParseResult::get_error);
+	ClassDB::bind_method(D_METHOD("get_error_string"), &JSONParseResult::get_error_string);
+	ClassDB::bind_method(D_METHOD("get_error_line"), &JSONParseResult::get_error_line);
+	ClassDB::bind_method(D_METHOD("get_result"), &JSONParseResult::get_result);
+
+	ClassDB::bind_method(D_METHOD("set_error", "error"), &JSONParseResult::set_error);
+	ClassDB::bind_method(D_METHOD("set_error_string", "error_string"), &JSONParseResult::set_error_string);
+	ClassDB::bind_method(D_METHOD("set_error_line", "error_line"), &JSONParseResult::set_error_line);
+	ClassDB::bind_method(D_METHOD("set_result", "result"), &JSONParseResult::set_result);
+
+	ADD_PROPERTYNZ(PropertyInfo(Variant::OBJECT, "error", PROPERTY_HINT_NONE, "Error", PROPERTY_USAGE_CLASS_IS_ENUM), "set_error", "get_error");
+	ADD_PROPERTYNZ(PropertyInfo(Variant::STRING, "error_string"), "set_error_string", "get_error_string");
+	ADD_PROPERTYNZ(PropertyInfo(Variant::INT, "error_line"), "set_error_line", "get_error_line");
+	ADD_PROPERTYNZ(PropertyInfo(Variant::NIL, "result", PROPERTY_HINT_NONE, "", PROPERTY_USAGE_NIL_IS_VARIANT), "set_result", "get_result");
+}
+
+void JSONParseResult::set_error(Error p_error) {
+	error = p_error;
+}
+
+Error JSONParseResult::get_error() const {
+	return error;
+}
+
+void JSONParseResult::set_error_string(const String &p_error_string) {
+	error_string = p_error_string;
+}
+
+String JSONParseResult::get_error_string() const {
+	return error_string;
+}
+
+void JSONParseResult::set_error_line(int p_error_line) {
+	error_line = p_error_line;
+}
+
+int JSONParseResult::get_error_line() const {
+	return error_line;
+}
+
+void JSONParseResult::set_result(const Variant &p_result) {
+	result = p_result;
+}
+
+Variant JSONParseResult::get_result() const {
+	return result;
+}
+
+void _JSON::_bind_methods() {
+	ClassDB::bind_method(D_METHOD("print", "value"), &_JSON::print);
+	ClassDB::bind_method(D_METHOD("parse", "json"), &_JSON::parse);
+}
+
+String _JSON::print(const Variant &p_value) {
+	return JSON::print(p_value);
+}
+
+Ref<JSONParseResult> _JSON::parse(const String &p_json) {
+	Ref<JSONParseResult> result;
+	result.instance();
+
+	result->error = JSON::parse(p_json, result->result, result->error_string, result->error_line);
+
+	return result;
+}
+
+_JSON *_JSON::singleton = NULL;
+
+_JSON::_JSON() {
+	singleton = this;
+}