BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-02 12:05:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

General Codebase clean up (#5939)

Browse Source 
* Fixed refractoring issue in reflection/generate_code.sh. Also, mv deletes the original file, so I don't need to clean it up manually in that case.

* Ensuring test/generate_code.sh was ran

* Fixed Dart Tests by removing code-gen for included files.

* General cleanup of codebase.
This commit is contained in:
Derek Bailey
2020-06-01 08:40:55 -07:00
committed by GitHub
parent a0da0c08c6
commit 7179a5a8ba
8 changed files with 34 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/reflection.cpp
View File

@@ -396,17 +396,17 @@ Offset<const Table *> CopyTable(FlatBufferBuilder &fbb,
case reflection::Obj: {
auto &subobjectdef = *schema.objects()->Get(fielddef.type()->index());
if (!subobjectdef.is_struct()) {
offset =
CopyTable(fbb, schema, subobjectdef,
*GetFieldT(table, fielddef), use_string_pooling).o;
offset = CopyTable(fbb, schema, subobjectdef,
*GetFieldT(table, fielddef), use_string_pooling)
.o;
}
break;
}
case reflection::Union: {
auto &subobjectdef = GetUnionType(schema, objectdef, fielddef, table);
offset =
CopyTable(fbb, schema, subobjectdef, *GetFieldT(table, fielddef),
use_string_pooling).o;
offset = CopyTable(fbb, schema, subobjectdef,
*GetFieldT(table, fielddef), use_string_pooling)
.o;
break;
}
case reflection::Vector: {
@@ -433,9 +433,8 @@ Offset<const Table *> CopyTable(FlatBufferBuilder &fbb,
if (!elemobjectdef->is_struct()) {
std::vector<Offset<const Table *>> elements(vec->size());
for (uoffset_t i = 0; i < vec->size(); i++) {
elements[i] =
CopyTable(fbb, schema, *elemobjectdef, *vec->Get(i),
use_string_pooling);
elements[i] = CopyTable(fbb, schema, *elemobjectdef,
*vec->Get(i), use_string_pooling);
}
offset = fbb.CreateVector(elements).o;
break;
@@ -705,8 +704,7 @@ bool VerifyObject(flatbuffers::Verifier &v, const reflection::Schema &schema,
}
bool Verify(const reflection::Schema &schema, const reflection::Object &root,
const uint8_t *buf, size_t length,
uoffset_t max_depth /*= 64*/,
const uint8_t *buf, size_t length, uoffset_t max_depth /*= 64*/,
uoffset_t max_tables /*= 1000000*/) {
Verifier v(buf, length, max_depth, max_tables);
return VerifyObject(v, schema, root, flatbuffers::GetAnyRoot(buf), true);