aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVoR0220 <rj@erisindustries.com>2017-01-10 21:15:48 +0800
committerVoR0220 <rj@erisindustries.com>2017-01-10 21:17:11 +0800
commit8ace851831f63035174ae086bb415a0d2efb8277 (patch)
tree286109f416818528e230502f1b92543eba4ec55a
parent79dbd40096006eac2861dd86dd22fd0c9ab55c6c (diff)
downloaddexon-solidity-8ace851831f63035174ae086bb415a0d2efb8277.tar.gz
dexon-solidity-8ace851831f63035174ae086bb415a0d2efb8277.tar.zst
dexon-solidity-8ace851831f63035174ae086bb415a0d2efb8277.zip
much smaller helper function
Signed-off-by: VoR0220 <rj@erisindustries.com>
-rw-r--r--libsolidity/interface/CompilerStack.cpp6
-rw-r--r--libsolidity/interface/CompilerStack.h4
2 files changed, 5 insertions, 5 deletions
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 1a95f5a6..094360a3 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -515,10 +515,8 @@ string CompilerStack::applyRemapping(string const& _path, string const& _context
for (auto const& redir: m_remappings)
{
- filepath redirContext(redir.context);
- filepath redirPrefix(redir.prefix);
- string contextFileString = redirContext.generic_string();
- string prefixFileString = redirPrefix.generic_string();
+ string contextFileString = sanitizePath(redir.context);
+ string prefixFileString = sanitizePath(redir.prefix);
// Skip if there is a prefix collision and the current context is closer
if (longestContext > 0 && contextFileString.length() < longestContext)
continue;
diff --git a/libsolidity/interface/CompilerStack.h b/libsolidity/interface/CompilerStack.h
index f98a457a..ef0aa6fe 100644
--- a/libsolidity/interface/CompilerStack.h
+++ b/libsolidity/interface/CompilerStack.h
@@ -29,6 +29,7 @@
#include <vector>
#include <functional>
#include <boost/noncopyable.hpp>
+#include <boost/filesystem.hpp>
#include <json/json.h>
#include <libdevcore/Common.h>
#include <libdevcore/FixedHash.h>
@@ -239,7 +240,8 @@ private:
ContractDefinition const& _contract,
std::map<ContractDefinition const*, eth::Assembly const*>& _compiledContracts
);
-
+ /// Helper function to return path converted strings.
+ std::string sanitizePath(std::string const& _path) { return boost::filesystem::path(_path).generic_string(); }
void link();
Contract const& contract(std::string const& _contractName = "") const;