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

Replace filenames in reflection with filenames+includes. (#6703)

Browse Source 
* Replace filenames in reflection with filenames+includes.

This is needed for some use cases and may be just useful metadata.

* deser files_included_per_file_

* check project_root

* fix bazel

* git clang format

Co-authored-by: Casper Neo <cneo@google.com>
This commit is contained in:
Casper
2021-06-19 19:21:33 -04:00
committed by GitHub
parent acce4ac3f0
commit 06fd6d640c
8 changed files with 802 additions and 657 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/idl_parser.cpp
View File

@@ -3530,10 +3530,29 @@ void Parser::Serialize() {
const std::string *file = (*it)->declaration_file;
if (file) files.insert(*file);
}
// TODO(caspern): CreateVectorOfSharedStrings
std::vector<Offset<flatbuffers::String>> file_offsets;
for (auto it = files.begin(); it != files.end(); it++) {
file_offsets.push_back(builder_.CreateSharedString(*it));
// Create Schemafiles vector of tables.
flatbuffers::Offset<
flatbuffers::Vector<flatbuffers::Offset<reflection::SchemaFile>>>
schema_files__;
if (!opts.project_root.empty()) {
std::vector<Offset<reflection::SchemaFile>> schema_files;
std::vector<Offset<flatbuffers::String>> included_files;
for (auto f = files_included_per_file_.begin();
f != files_included_per_file_.end(); f++) {
const auto filename__ = builder_.CreateSharedString(
RelativeToRootPath(opts.project_root, f->first));
for (auto i = f->second.begin(); i != f->second.end(); i++) {
included_files.push_back(builder_.CreateSharedString(
RelativeToRootPath(opts.project_root, *i)));
}
const auto included_files__ = builder_.CreateVector(included_files);
included_files.clear();
schema_files.push_back(
reflection::CreateSchemaFile(builder_, filename__, included_files__));
}
schema_files__ = builder_.CreateVectorOfSortedTables(&schema_files);
}
const auto objs__ = builder_.CreateVectorOfSortedTables(&object_offsets);
@@ -3541,11 +3560,11 @@ void Parser::Serialize() {
const auto fiid__ = builder_.CreateString(file_identifier_);
const auto fext__ = builder_.CreateString(file_extension_);
const auto serv__ = builder_.CreateVectorOfSortedTables(&service_offsets);
const auto files__ = builder_.CreateVector(file_offsets);
const auto schema_offset = reflection::CreateSchema(
builder_, objs__, enum__, fiid__, fext__,
(root_struct_def_ ? root_struct_def_->serialized_location : 0), serv__,
static_cast<reflection::AdvancedFeatures>(advanced_features_), files__);
static_cast<reflection::AdvancedFeatures>(advanced_features_),
schema_files__);
if (opts.size_prefixed) {
builder_.FinishSizePrefixed(schema_offset, reflection::SchemaIdentifier());
} else {
@@ -3967,6 +3986,16 @@ bool Parser::Deserialize(const reflection::Schema *schema) {
}
}
advanced_features_ = schema->advanced_features();
if (schema->fbs_files())
for (auto s = schema->fbs_files()->begin(); s != schema->fbs_files()->end();
++s) {
for (auto f = s->included_filenames()->begin();
f != s->included_filenames()->end(); ++f) {
files_included_per_file_[s->filename()->str()].insert(f->str());
}
}
return true;
}