godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #49107 from timothyqiu/circular-structure 

Fix json dump and print of circular structure
This commit is contained in:
Rémi Verschelde 2021-06-15 15:43:55 +02:00 committed by GitHub
parent fbdb1e0bab b3bd54001f
commit 78a2d3a967
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
core/io/json.cpp
View File

@ -55,7 +55,7 @@ static String _make_indent(const String &p_indent, int p_size) {
return indent_text; return indent_text;
} }
String JSON::_print_var(const Variant &p_var, const String &p_indent, int p_cur_indent, bool p_sort_keys, bool p_full_precision) { String JSON::_print_var(const Variant &p_var, const String &p_indent, int p_cur_indent, bool p_sort_keys, Set<const void *> &p_markers, bool p_full_precision) {
String colon = ":"; String colon = ":";
String end_statement = ""; String end_statement = "";
@ -91,20 +91,29 @@ String JSON::_print_var(const Variant &p_var, const String &p_indent, int p_cur_
String s = "["; String s = "[";
s += end_statement; s += end_statement;
Array a = p_var; Array a = p_var;
ERR_FAIL_COND_V_MSG(p_markers.has(a.id()), "\"[...]\"", "Converting circular structure to JSON.");
p_markers.insert(a.id());
for (int i = 0; i < a.size(); i++) { for (int i = 0; i < a.size(); i++) {
if (i > 0) { if (i > 0) {
s += ","; s += ",";
s += end_statement; s += end_statement;
} }
s += _make_indent(p_indent, p_cur_indent + 1) + _print_var(a[i], p_indent, p_cur_indent + 1, p_sort_keys); s += _make_indent(p_indent, p_cur_indent + 1) + _print_var(a[i], p_indent, p_cur_indent + 1, p_sort_keys, p_markers);
} }
s += end_statement + _make_indent(p_indent, p_cur_indent) + "]"; s += end_statement + _make_indent(p_indent, p_cur_indent) + "]";
p_markers.erase(a.id());
return s; return s;
} }
case Variant::DICTIONARY: { case Variant::DICTIONARY: {
String s = "{"; String s = "{";
s += end_statement; s += end_statement;
Dictionary d = p_var; Dictionary d = p_var;
ERR_FAIL_COND_V_MSG(p_markers.has(d.id()), "\"{...}\"", "Converting circular structure to JSON.");
p_markers.insert(d.id());
List<Variant> keys; List<Variant> keys;
d.get_key_list(&keys); d.get_key_list(&keys);
@ -117,12 +126,13 @@ String JSON::_print_var(const Variant &p_var, const String &p_indent, int p_cur_
s += ","; s += ",";
s += end_statement; s += end_statement;
} }
s += _make_indent(p_indent, p_cur_indent + 1) + _print_var(String(E->get()), p_indent, p_cur_indent + 1, p_sort_keys); s += _make_indent(p_indent, p_cur_indent + 1) + _print_var(String(E->get()), p_indent, p_cur_indent + 1, p_sort_keys, p_markers);
s += colon; s += colon;
s += _print_var(d[E->get()], p_indent, p_cur_indent + 1, p_sort_keys); s += _print_var(d[E->get()], p_indent, p_cur_indent + 1, p_sort_keys, p_markers);
} }
s += end_statement + _make_indent(p_indent, p_cur_indent) + "}"; s += end_statement + _make_indent(p_indent, p_cur_indent) + "}";
p_markers.erase(d.id());
return s; return s;
} }
default: default:
@ -131,7 +141,8 @@ String JSON::_print_var(const Variant &p_var, const String &p_indent, int p_cur_
} }
String JSON::print(const Variant &p_var, const String &p_indent, bool p_sort_keys, bool p_full_precision) { String JSON::print(const Variant &p_var, const String &p_indent, bool p_sort_keys, bool p_full_precision) {
return _print_var(p_var, p_indent, 0, p_sort_keys, p_full_precision); Set<const void *> markers;
return _print_var(p_var, p_indent, 0, p_sort_keys, markers, p_full_precision);
} }
Error JSON::_get_token(const char32_t *p_str, int &index, int p_len, Token &r_token, int &line, String &r_err_str) { Error JSON::_get_token(const char32_t *p_str, int &index, int p_len, Token &r_token, int &line, String &r_err_str) {

2
core/io/json.h
View File

@ -62,7 +62,7 @@ class JSON {
static const char *tk_name[TK_MAX]; static const char *tk_name[TK_MAX];
static String _print_var(const Variant &p_var, const String &p_indent, int p_cur_indent, bool p_sort_keys, bool p_full_precision = false); static String _print_var(const Variant &p_var, const String &p_indent, int p_cur_indent, bool p_sort_keys, Set<const void *> &p_markers, bool p_full_precision = false);
static Error _get_token(const char32_t *p_str, int &index, int p_len, Token &r_token, int &line, String &r_err_str); static Error _get_token(const char32_t *p_str, int &index, int p_len, Token &r_token, int &line, String &r_err_str);
static Error _parse_value(Variant &value, Token &token, const char32_t *p_str, int &index, int p_len, int &line, String &r_err_str); static Error _parse_value(Variant &value, Token &token, const char32_t *p_str, int &index, int p_len, int &line, String &r_err_str);

2
core/variant/variant.cpp
View File

@ -1698,6 +1698,7 @@ String Variant::stringify(List<const void *> &stack) const {
} }
str += "}"; str += "}";
stack.erase(d.id());
return str; return str;
} break; } break;
case PACKED_VECTOR2_ARRAY: { case PACKED_VECTOR2_ARRAY: {
@ -1801,6 +1802,7 @@ String Variant::stringify(List<const void *> &stack) const {
} }
str += "]"; str += "]";
stack.erase(arr.id());
return str; return str;
} break; } break;