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

fixed test and added solution

Browse Source 
Signed-off-by: VoR0220 <rj@erisindustries.com>
This commit is contained in:
VoR0220 2017-01-05 12:01:27 -06:00
parent 4f62980d52
commit 6d9020b3b8
No known key found for this signature in database
GPG Key ID: D4AB109D9B5D6386
2 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libsolidity/interface/CompilerStack.cpp
View File

@ -507,21 +507,44 @@ string CompilerStack::applyRemapping(string const& _path, string const& _context
return false; return false;
return std::equal(_a.begin(), _a.end(), _b.begin()); return std::equal(_a.begin(), _a.end(), _b.begin());
}; };
// Try to find whether _a is a closer match for context _reference than _b
// Defaults to longest prefix in case of a tie.
auto isClosestContext = [](string const& _a, string const& _b, string const& _reference)
{
int a = _reference.compare(_a);
int b = _reference.compare(_b);
if (a == 0)
return true;
else if (b == 0)
return false;
else if (abs(a) == abs(b)) {
return a > 0;
}
return abs(a) < abs(b);
};
using filepath = boost::filesystem::path;
filepath context(_context);
size_t longestPrefix = 0; size_t longestPrefix = 0;
string longestPrefixTarget; string longestPrefixTarget;
string currentClosestContext;
string referenceContext = context.parent_path().generic_string();
for (auto const& redir: m_remappings) for (auto const& redir: m_remappings)
{ {
filepath redirContext(redir.context);
// Skip if we already have a closer match. // Skip if we already have a closer match.
if (longestPrefix > 0 && redir.prefix.length() <= longestPrefix) if (longestPrefix > 0 && redir.prefix.length() < longestPrefix)
continue; continue;
// Skip if redir.context is not a prefix of _context // Skip if redir.context is not a prefix of _context
if (!isPrefixOf(redir.context, _context)) if (!isPrefixOf(redirContext.generic_string(), _context))
continue; continue;
// Skip if the prefix does not match. // Skip if the prefix does not match.
if (!isPrefixOf(redir.prefix, _path)) if (!isPrefixOf(redir.prefix, _path))
continue; continue;
// Skip if there is a prefix collision and the current context is closer
if (redir.prefix.length() == longestPrefix && !isClosestContext(redirContext.generic_string(), currentClosestContext, referenceContext))
continue;
currentClosestContext = redir.context;
longestPrefix = redir.prefix.length(); longestPrefix = redir.prefix.length();
longestPrefixTarget = redir.target; longestPrefixTarget = redir.target;
} }

4
test/libsolidity/Imports.cpp
View File

@ -176,8 +176,8 @@ BOOST_AUTO_TEST_CASE(context_dependent_remappings_ensure_default_and_module_pres
{ {
CompilerStack c; CompilerStack c;
c.setRemappings(vector<string>{"foo=vendor/foo_2.0.0", "vendor/bar:foo=vendor/foo_1.0.0", "bar=vendor/bar"}); c.setRemappings(vector<string>{"foo=vendor/foo_2.0.0", "vendor/bar:foo=vendor/foo_1.0.0", "bar=vendor/bar"});
c.addSource("main.sol", "import \"foo/foo.sol\"; import {Bar} \"bar/bar.sol\"; contract Main is Foo2, Bar {} pragma solidity >=0.0;"); c.addSource("main.sol", "import \"foo/foo.sol\"; import {Bar} from \"bar/bar.sol\"; contract Main is Foo2, Bar {} pragma solidity >=0.0;");
c.addSource("vendor/bar/bar.sol", "import \"foo/foo.sol\"; contract Bar is Foo1 {} pragma solidity >=0.0;"); c.addSource("vendor/bar/bar.sol", "import \"foo/foo.sol\"; contract Bar {Foo1 foo;} pragma solidity >=0.0;");
c.addSource("vendor/foo_1.0.0/foo.sol", "contract Foo1 {} pragma solidity >=0.0;"); c.addSource("vendor/foo_1.0.0/foo.sol", "contract Foo1 {} pragma solidity >=0.0;");
c.addSource("vendor/foo_2.0.0/foo.sol", "contract Foo2 {} pragma solidity >=0.0;"); c.addSource("vendor/foo_2.0.0/foo.sol", "contract Foo2 {} pragma solidity >=0.0;");
BOOST_CHECK(c.compile()); BOOST_CHECK(c.compile());