evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Empty JSON objects should be printed as {}, not { \n} + fix the new Json hasher not sorting keys

Browse Source 
[skip ci]
This commit is contained in:
Kae 2024-04-18 08:42:58 +10:00
parent 83ca73b299
commit 1587bb2409
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/core/StarJson.cpp
View File

@ -981,9 +981,17 @@ void Json::getHash(XXHash3& hasher) const {
json.getHash(hasher);
}
else if (type == Json::Type::Object) {
for (auto const& pair : *m_data.get<JsonObjectConstPtr>()) {
hasher.push(pair.first.utf8Ptr(), pair.first.utf8Size());
pair.second.getHash(hasher);
auto& object = *m_data.get<JsonObjectConstPtr>();
List<JsonObject::const_iterator> iterators;
iterators.reserve(object.size());
for (auto i = object.begin(); i != object.end(); ++i)
iterators.append(i);
iterators.sort([](JsonObject::const_iterator a, JsonObject::const_iterator b) {
return a->first < b->first;
});
for (auto& iter : iterators) {
hasher.push(iter->first.utf8Ptr(), iter->first.utf8Size());
iter->second.getHash(hasher);
}
}
}

5
source/core/StarJsonParser.hpp
View File

@ -521,11 +521,12 @@ public:
}
void endObject() {
popState(Object);
if (currentState() == ObjectElement) {
if (m_pretty)
write('\n');
indent();
}
popState(Object);
write('}');
}