Moved JSON functions to built-in to_json, parse_json, validate_json

3 files changed, 78 insertions, 1 deletions

diff --git a/modules/gdscript/gd_functions.cpp b/modules/gdscript/gd_functions.cpp
index 74b804b206..64578e5f5c 100644
--- a/modules/gdscript/gd_functions.cpp
+++ b/modules/gdscript/gd_functions.cpp
@@ -35,6 +35,7 @@
 #include "os/os.h"
 #include "variant_parser.h"
 #include "io/marshalls.h"
+#include "io/json.h"
 
 const char *GDFunctions::get_func_name(Function p_func) {
 
@@ -103,6 +104,9 @@ const char *GDFunctions::get_func_name(Function p_func) {
 		"load",
 		"inst2dict",
 		"dict2inst",
+		"validate_json",
+		"parse_json",
+		"to_json",
 		"hash",
 		"Color8",
 		"print_stack",
@@ -846,6 +850,7 @@ void GDFunctions::call(Function p_func,const Variant **p_args,int p_arg_count,Va
 			if (p_args[0]->get_type()!=Variant::STRING) {
 				r_error.error=Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
 				r_error.argument=0;
+				r_error.expected=Variant::STRING;
 				r_ret=Variant();
 			} else {
 				r_ret=ResourceLoader::load(*p_args[0]);
@@ -1024,6 +1029,57 @@ void GDFunctions::call(Function p_func,const Variant **p_args,int p_arg_count,Va
 			}
 
 		} break;
+		case VALIDATE_JSON: {
+
+			VALIDATE_ARG_COUNT(1);
+
+			if (p_args[0]->get_type()!=Variant::STRING) {
+				r_error.error=Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+				r_error.argument=0;
+				r_error.expected=Variant::STRING;
+				r_ret=Variant();
+				return;
+			}
+
+			String errs;
+			int errl;
+
+			Error err = JSON::parse(*p_args[0],r_ret,errs,errl);
+
+			if (err!=OK) {
+				r_ret=itos(errl)+":"+errs;
+			} else {
+				r_ret="";
+			}
+
+		} break;
+		case PARSE_JSON: {
+
+			VALIDATE_ARG_COUNT(1);
+
+			if (p_args[0]->get_type()!=Variant::STRING) {
+				r_error.error=Variant::CallError::CALL_ERROR_INVALID_ARGUMENT;
+				r_error.argument=0;
+				r_error.expected=Variant::STRING;
+				r_ret=Variant();
+				return;
+			}
+
+			String errs;
+			int errl;
+
+			Error err = JSON::parse(*p_args[0],r_ret,errs,errl);
+
+			if (err!=OK) {
+				r_ret=Variant();
+			}
+
+		} break;
+		case TO_JSON: {
+			VALIDATE_ARG_COUNT(1);
+
+			r_ret = JSON::print(*p_args[0]);
+		} break;
 		case HASH: {
 
 			VALIDATE_ARG_COUNT(1);
@@ -1510,6 +1566,24 @@ MethodInfo GDFunctions::get_info(Function p_func) {
 			mi.return_val.type=Variant::OBJECT;
 			return mi;
 		} break;
+		case VALIDATE_JSON: {
+
+			MethodInfo mi("validate_json:Variant",PropertyInfo(Variant::STRING,"json"));
+			mi.return_val.type=Variant::STRING;
+			return mi;
+		} break;
+		case PARSE_JSON: {
+
+			MethodInfo mi("parse_json:Variant",PropertyInfo(Variant::STRING,"json"));
+			mi.return_val.type=Variant::NIL;
+			return mi;
+		} break;
+		case TO_JSON: {
+
+			MethodInfo mi("to_json",PropertyInfo(Variant::NIL,"var:Variant"));
+			mi.return_val.type=Variant::STRING;
+			return mi;
+		} break;
 		case HASH: {
 
 			MethodInfo mi("hash",PropertyInfo(Variant::NIL,"var:Variant"));
diff --git a/modules/gdscript/gd_functions.h b/modules/gdscript/gd_functions.h
index fb04527060..ab708e3ebe 100644
--- a/modules/gdscript/gd_functions.h
+++ b/modules/gdscript/gd_functions.h
@@ -97,6 +97,9 @@ public:
 		RESOURCE_LOAD,
 		INST2DICT,
 		DICT2INST,
+		VALIDATE_JSON,
+		PARSE_JSON,
+		TO_JSON,
 		HASH,
 		COLOR8,
 		PRINT_STACK,
diff --git a/modules/gdscript/gd_tokenizer.cpp b/modules/gdscript/gd_tokenizer.cpp
index fcf2d25806..2b306a92fc 100644
--- a/modules/gdscript/gd_tokenizer.cpp
+++ b/modules/gdscript/gd_tokenizer.cpp
@@ -1060,7 +1060,7 @@ void GDTokenizerText::advance(int p_amount) {
 
 //////////////////////////////////////////////////////////////////////////////////////////////////////
 
-#define BYTECODE_VERSION 11
+#define BYTECODE_VERSION 12
 
 Error GDTokenizerBuffer::set_code_buffer(const Vector<uint8_t> & p_buffer) {