diff options
| -rw-r--r-- | libsolidity/interface/CompilerStack.cpp | 4 | ||||
| -rw-r--r-- | test/libsolidity/Imports.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp index e4c351ff..a31df584 100644 --- a/libsolidity/interface/CompilerStack.cpp +++ b/libsolidity/interface/CompilerStack.cpp @@ -516,6 +516,7 @@ string CompilerStack::applyRemapping(string const& _path, string const& _context { string context = sanitizePath(redir.context); string prefix = sanitizePath(redir.prefix); + // Skip if current context is closer if (context.length() < longestContext) continue; @@ -531,9 +532,8 @@ string CompilerStack::applyRemapping(string const& _path, string const& _context longestContext = context.length(); longestPrefix = prefix.length(); - bestMatchTarget = redir.target; + bestMatchTarget = sanitizePath(redir.target); } - string path = bestMatchTarget; path.append(_path.begin() + longestPrefix, _path.end()); return path; diff --git a/test/libsolidity/Imports.cpp b/test/libsolidity/Imports.cpp index 712f133a..56895fdc 100644 --- a/test/libsolidity/Imports.cpp +++ b/test/libsolidity/Imports.cpp @@ -189,14 +189,14 @@ BOOST_AUTO_TEST_CASE(context_dependent_remappings_order_independent) c.setRemappings(vector<string>{"a:x/y/z=d", "a/b:x=e"}); c.addSource("a/main.sol", "import \"x/y/z/z.sol\"; contract Main is D {} pragma solidity >=0.0;"); c.addSource("a/b/main.sol", "import \"x/y/z/z.sol\"; contract Main is E {} pragma solidity >=0.0;"); - c.addSource("x/y/z/z.sol", "contract D {} pragma solidity >=0.0;"); + c.addSource("d/z.sol", "contract D {} pragma solidity >=0.0;"); c.addSource("e/y/z/z.sol", "contract E {} pragma solidity >=0.0;"); BOOST_CHECK(c.compile()); CompilerStack d; d.setRemappings(vector<string>{"a/b:x=e", "a:x/y/z=d"}); d.addSource("a/main.sol", "import \"x/y/z/z.sol\"; contract Main is D {} pragma solidity >=0.0;"); d.addSource("a/b/main.sol", "import \"x/y/z/z.sol\"; contract Main is E {} pragma solidity >=0.0;"); - d.addSource("x/y/z/z.sol", "contract D {} pragma solidity >=0.0;"); + d.addSource("d/z.sol", "contract D {} pragma solidity >=0.0;"); d.addSource("e/y/z/z.sol", "contract E {} pragma solidity >=0.0;"); BOOST_CHECK(d.compile()); } |