BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-07-03 21:34:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed hashed values in JSON for signed ints.

Browse Source 
Change-Id: Iae389c6dc9776058b39f4017d30efbf9580aced1
Tested: on Linux.
This commit is contained in:
Wouter van Oortmerssen
2017-04-17 17:40:02 -07:00
parent b627b7c6c6
commit 46497e4f9a
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/idl_parser.cpp
View File

@@ -1098,14 +1098,24 @@ CheckedError Parser::ParseHash(Value &e, FieldDef* field) {
assert(field); assert(field);
Value *hash_name = field->attributes.Lookup("hash"); Value *hash_name = field->attributes.Lookup("hash");
switch (e.type.base_type) { switch (e.type.base_type) {
case BASE_TYPE_INT: case BASE_TYPE_INT: {
auto hash = FindHashFunction32(hash_name->constant.c_str());
int32_t hashed_value = static_cast<int32_t>(hash(attribute_.c_str()));
e.constant = NumToString(hashed_value);
break;
}
case BASE_TYPE_UINT: { case BASE_TYPE_UINT: {
auto hash = FindHashFunction32(hash_name->constant.c_str()); auto hash = FindHashFunction32(hash_name->constant.c_str());
uint32_t hashed_value = hash(attribute_.c_str()); uint32_t hashed_value = hash(attribute_.c_str());
e.constant = NumToString(hashed_value); e.constant = NumToString(hashed_value);
break; break;
} }
case BASE_TYPE_LONG: case BASE_TYPE_LONG: {
auto hash = FindHashFunction64(hash_name->constant.c_str());
int64_t hashed_value = static_cast<int64_t>(hash(attribute_.c_str()));
e.constant = NumToString(hashed_value);
break;
}
case BASE_TYPE_ULONG: { case BASE_TYPE_ULONG: {
auto hash = FindHashFunction64(hash_name->constant.c_str()); auto hash = FindHashFunction64(hash_name->constant.c_str());
uint64_t hashed_value = hash(attribute_.c_str()); uint64_t hashed_value = hash(attribute_.c_str());