BigfootDev/flatbuffers
1
0
Fork 1
mirror of https://github.com/google/flatbuffers.git synced 2026-06-24 04:11:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Search for includes in the directory containg the current file (#6371)

Browse Source 
* [codegen] Search for includes in the directory containg the current file

This matches the behavior of a C preprocessor, see:
https://gcc.gnu.org/onlinedocs/cpp/Search-Path.html

* Skip FileExists() when file is guaranteed to not exist

* end comment with period to match others
This commit is contained in:
Mark Spatz
2021-01-19 12:26:34 -08:00
committed by GitHub
parent 8008dde117
commit 91b0958c43
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/idl_parser.cpp
View File

@@ -3176,11 +3176,19 @@ CheckedError Parser::DoParse(const char *source, const char **include_paths,
if (opts.proto_mode && attribute_ == "public") NEXT(); if (opts.proto_mode && attribute_ == "public") NEXT();
auto name = flatbuffers::PosixPath(attribute_.c_str()); auto name = flatbuffers::PosixPath(attribute_.c_str());
EXPECT(kTokenStringConstant); EXPECT(kTokenStringConstant);
// Look for the file in include_paths. // Look for the file relative to the directory of the current file.
std::string filepath; std::string filepath;
for (auto paths = include_paths; paths && *paths; paths++) { if (source_filename) {
filepath = flatbuffers::ConCatPathFileName(*paths, name); auto source_file_directory =
if (FileExists(filepath.c_str())) break; flatbuffers::StripFileName(source_filename);
filepath = flatbuffers::ConCatPathFileName(source_file_directory, name);
}
if (filepath.empty() || !FileExists(filepath.c_str())) {
// Look for the file in include_paths.
for (auto paths = include_paths; paths && *paths; paths++) {
filepath = flatbuffers::ConCatPathFileName(*paths, name);
if (FileExists(filepath.c_str())) break;
}
} }
if (filepath.empty()) if (filepath.empty())
return Error("unable to locate include file: " + name); return Error("unable to locate include file: " + name);