michael/lean2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(util/lean_path): throws an exception if there is an ambiguity when importing a module

Browse source 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
This commit is contained in:
Leonardo de Moura 2014-08-27 10:18:35 -07:00
parent 9484ab6a04
commit f4c7154825
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/util/lean_path.cpp
View file

@ -174,8 +174,11 @@ optional<std::string> check_file(std::string const & path, std::string const & f
std::string file = path + g_sep + fname; std::string file = path + g_sep + fname;
if (is_directory(file.c_str())) { if (is_directory(file.c_str())) {
std::string default_file = file + g_sep + g_default_file_name; std::string default_file = file + g_sep + g_default_file_name;
if (auto r = check_file_core(default_file, ext)) if (auto r1 = check_file_core(default_file, ext)) {
return r; if (auto r2 = check_file_core(file, ext))
throw exception(sstream() << "ambiguous import, it can be '" << *r1 << "' or '" << *r2 << "'");
return r1;
}
} }
return check_file_core(file, ext); return check_file_core(file, ext);
} }