riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #452 from cr1901/master 

Accommodate Windows-style paths during include-file processing.
This commit is contained in:
Clifford Wolf 2017-11-18 09:58:40 +01:00 committed by GitHub
parent c01df04e32 abc5b4b8ce
commit a4195e83c7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
frontends/verilog/preproc.cc
View File

@ -366,14 +366,31 @@ std::string frontend_verilog_preproc(std::istream &f, std::string filename, cons
ff.clear(); ff.clear();
std::string fixed_fn = fn; std::string fixed_fn = fn;
ff.open(fixed_fn.c_str()); ff.open(fixed_fn.c_str());
if (ff.fail() && fn.size() > 0 && fn[0] != '/' && filename.find('/') != std::string::npos) {
bool filename_path_sep_found;
bool fn_relative;
#ifdef _WIN32
// Both forward and backslash are acceptable separators on Windows.
filename_path_sep_found = (filename.find_first_of("/\\") != std::string::npos);
// Easier just to invert the check for an absolute path (e.g. C:\ or C:/)
fn_relative = !(fn[1] == ':' && (fn[2] == '/' || fn[2] == '\\'));
#else
filename_path_sep_found = (filename.find('/') != std::string::npos);
fn_relative = (fn[0] != '/');
#endif
if (ff.fail() && fn.size() > 0 && fn_relative && filename_path_sep_found) {
// if the include file was not found, it is not given with an absolute path, and the // if the include file was not found, it is not given with an absolute path, and the
// currently read file is given with a path, then try again relative to its directory // currently read file is given with a path, then try again relative to its directory
ff.clear(); ff.clear();
#ifdef _WIN32
fixed_fn = filename.substr(0, filename.find_last_of("/\\")+1) + fn;
#else
fixed_fn = filename.substr(0, filename.rfind('/')+1) + fn; fixed_fn = filename.substr(0, filename.rfind('/')+1) + fn;
#endif
ff.open(fixed_fn); ff.open(fixed_fn);
} }
if (ff.fail() && fn.size() > 0 && fn[0] != '/') { if (ff.fail() && fn.size() > 0 && fn_relative) {
// if the include file was not found and it is not given with an absolute path, then // if the include file was not found and it is not given with an absolute path, then
// search it in the include path // search it in the include path
for (auto incdir : include_dirs) { for (auto incdir : include_dirs) {
@ -505,7 +522,7 @@ std::string frontend_verilog_preproc(std::istream &f, std::string filename, cons
if (try_expand_macro(defines_with_args, defines_map, tok)) if (try_expand_macro(defines_with_args, defines_map, tok))
continue; continue;
output_code.push_back(tok); output_code.push_back(tok);
} }
@ -521,4 +538,3 @@ std::string frontend_verilog_preproc(std::istream &f, std::string filename, cons
} }
YOSYS_NAMESPACE_END YOSYS_NAMESPACE_END