cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add const and file name.

Browse Source
This commit is contained in:
chriseth 2021-12-13 17:33:48 +01:00
parent 15c2ed3b9f
commit c0b41cfcdd
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libsolidity/interface/CompilerStack.cpp
View File

@ -1447,7 +1447,7 @@ CompilerStack::Source const& CompilerStack::source(string const& _sourceName) co
{ {
auto it = m_sources.find(_sourceName); auto it = m_sources.find(_sourceName);
if (it == m_sources.end()) if (it == m_sources.end())
solThrow(CompilerError, "Given source file not found."); solThrow(CompilerError, "Given source file not found: " + _sourceName);
return it->second; return it->second;
} }

4
libsolidity/interface/FileReader.cpp
View File

@ -172,7 +172,7 @@ ReadCallback::Result FileReader::readFile(string const& _kind, string const& _so
} }
} }
string FileReader::cliPathToSourceUnitName(boost::filesystem::path const& _cliPath) string FileReader::cliPathToSourceUnitName(boost::filesystem::path const& _cliPath) const
{ {
vector<boost::filesystem::path> prefixes = {m_basePath.empty() ? normalizeCLIPathForVFS(".") : m_basePath}; vector<boost::filesystem::path> prefixes = {m_basePath.empty() ? normalizeCLIPathForVFS(".") : m_basePath};
prefixes += m_includePaths; prefixes += m_includePaths;
@ -189,7 +189,7 @@ string FileReader::cliPathToSourceUnitName(boost::filesystem::path const& _cliPa
return normalizedPath.generic_string(); return normalizedPath.generic_string();
} }
map<string, FileReader::FileSystemPathSet> FileReader::detectSourceUnitNameCollisions(FileSystemPathSet const& _cliPaths) map<string, FileReader::FileSystemPathSet> FileReader::detectSourceUnitNameCollisions(FileSystemPathSet const& _cliPaths) const
{ {
map<string, FileReader::FileSystemPathSet> nameToPaths; map<string, FileReader::FileSystemPathSet> nameToPaths;
for (boost::filesystem::path const& cliPath: _cliPaths) for (boost::filesystem::path const& cliPath: _cliPaths)

4
libsolidity/interface/FileReader.h
View File

@ -93,14 +93,14 @@ public:
/// Creates a source unit name by normalizing a path given on the command line and, if possible, /// Creates a source unit name by normalizing a path given on the command line and, if possible,
/// making it relative to base path or one of the include directories. /// making it relative to base path or one of the include directories.
std::string cliPathToSourceUnitName(boost::filesystem::path const& _cliPath); std::string cliPathToSourceUnitName(boost::filesystem::path const& _cliPath) const;
/// Checks if a set contains any paths that lead to different files but would receive identical /// Checks if a set contains any paths that lead to different files but would receive identical
/// source unit names. Files are considered the same if their paths are exactly the same after /// source unit names. Files are considered the same if their paths are exactly the same after
/// normalization (without following symlinks). /// normalization (without following symlinks).
/// @returns a map containing all the conflicting source unit names and the paths that would /// @returns a map containing all the conflicting source unit names and the paths that would
/// receive them. The returned paths are normalized. /// receive them. The returned paths are normalized.
std::map<std::string, FileSystemPathSet> detectSourceUnitNameCollisions(FileSystemPathSet const& _cliPaths); std::map<std::string, FileSystemPathSet> detectSourceUnitNameCollisions(FileSystemPathSet const& _cliPaths) const;
/// Normalizes a filesystem path to make it include all components up to the filesystem root, /// Normalizes a filesystem path to make it include all components up to the filesystem root,
/// remove small, inconsequential differences that do not affect the meaning and make it look /// remove small, inconsequential differences that do not affect the meaning and make it look