summaryrefslogtreecommitdiffstats
path: root/core/variant/variant.cpp
diff options
context:
space:
mode:
authorMarcel Admiraal <madmiraal@users.noreply.github.com>2020-12-29 18:12:33 +0000
committerMarcel Admiraal <madmiraal@users.noreply.github.com>2021-06-19 08:01:40 +0100
commit2bafcd3422bea8baf2282f5de87538a59f0bb254 (patch)
tree7c9d09df5f4d8d0a575f53724eb95b02521fb5e8 /core/variant/variant.cpp
parentdf170c8af05c7e81a83ddae4e4d62c65d7086bc3 (diff)
downloadredot-engine-2bafcd3422bea8baf2282f5de87538a59f0bb254.tar.gz
Consolidate JSON, JSONParseResults and JSONParser into JSON
Renames JSON.parse_string() to parse() Renames JSON.decode_data() to stringify()
Diffstat (limited to 'core/variant/variant.cpp')
-rw-r--r--core/variant/variant.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/core/variant/variant.cpp b/core/variant/variant.cpp
index 4e45862fd3..badb5ba103 100644
--- a/core/variant/variant.cpp
+++ b/core/variant/variant.cpp
@@ -32,6 +32,7 @@
#include "core/core_string_names.h"
#include "core/debugger/engine_debugger.h"
+#include "core/io/json.h"
#include "core/io/marshalls.h"
#include "core/io/resource.h"
#include "core/math/math_funcs.h"
@@ -1838,6 +1839,11 @@ String Variant::stringify(List<const void *> &stack) const {
return "";
}
+String Variant::to_json_string() const {
+ JSON json;
+ return json.stringify(*this);
+}
+
Variant::operator Vector2() const {
if (type == VECTOR2) {
return *reinterpret_cast<const Vector2 *>(_data._mem);